Merge pull request #443 from bastelfreak/zabbix34

Bump default zabbix version to 3.4 + test on it
voxpupuli · Sep 17, 2017 · ac3c78b · ac3c78b
2 parents 125adcf + 5f6c487
commit ac3c78b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -80,7 +80,7 @@
   $zabbix_template_dir                      = '/etc/zabbix/imported_templates'
   $zabbix_timezone                          = 'Europe/Amsterdam'
   $zabbix_url                               = 'localhost'
-  $zabbix_version                           = '3.2'
+  $zabbix_version                           = '3.4'
   $zabbix_web                               = 'localhost'
   $zabbix_web_ip                            = '127.0.0.1'
   $manage_database                          = true

diff --git a/spec/acceptance/agent_spec.rb b/spec/acceptance/agent_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-['2.4', '3.2'].each do |version|
+['2.4', '3.2', '3.4'].each do |version|
   if version == '2.4' && default[:platform] =~ %r{(ubuntu-16.04-amd64|debian-8-amd64)}
     next
   end

diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
@@ -69,11 +69,11 @@
           it { is_expected.to raise_error(Puppet::Error, %r{Managing a repo on Archlinux is currently not implemented}) }
         when 'Debian'
           # rubocop:disable RSpec/RepeatedExample
-          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.4') }
           it { is_expected.to contain_package('zabbix-agent').with_require('Class[Zabbix::Repo]') }
           it { is_expected.to contain_apt__source('zabbix') }
         when 'RedHat'
-          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.4') }
           it { is_expected.to contain_package('zabbix-agent').with_require('Class[Zabbix::Repo]') }
           it { is_expected.to contain_yumrepo('zabbix-nonsupported') }
           it { is_expected.to contain_yumrepo('zabbix') }

diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
@@ -44,7 +44,7 @@
             }
           end
 
-          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.4') }
           it { is_expected.to contain_package('zabbix-proxy-pgsql').with_require('Class[Zabbix::Repo]') }
           it { is_expected.to contain_yumrepo('zabbix-nonsupported') }
           it { is_expected.to contain_yumrepo('zabbix') }
@@ -118,7 +118,7 @@
           end
 
           it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_type('proxy') }
-          it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_version('3.4') }
           it { is_expected.to contain_class('zabbix::database::postgresql').with_database_name('zabbix_proxy') }
           it { is_expected.to contain_class('zabbix::database::postgresql').with_database_user('zabbix-proxy') }
           it { is_expected.to contain_class('zabbix::database::postgresql').with_database_password('zabbix-proxy') }
@@ -138,7 +138,7 @@
           end
 
           it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_type('proxy') }
-          it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_version('3.4') }
           it { is_expected.to contain_class('zabbix::database::mysql').with_database_name('zabbix_proxy') }
           it { is_expected.to contain_class('zabbix::database::mysql').with_database_user('zabbix-proxy') }
           it { is_expected.to contain_class('zabbix::database::mysql').with_database_password('zabbix-proxy') }

diff --git a/spec/classes/sender_spec.rb b/spec/classes/sender_spec.rb
@@ -30,7 +30,7 @@
             is_expected.to raise_error(Puppet::Error, %r{Managing a repo on Archlinux is currently not implemented})
           end
         else
-          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.2') }
+          it { is_expected.to contain_class('zabbix::repo').with_zabbix_version('3.4') }
           it { is_expected.to contain_package('zabbix-sender').with_require('Class[Zabbix::Repo]') }
         end
       end

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -78,7 +78,7 @@
         end
 
         it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_type('server') }
-        it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_version('3.2') }
+        it { is_expected.to contain_class('zabbix::database::postgresql').with_zabbix_version('3.4') }
         it { is_expected.to contain_class('zabbix::database::postgresql').with_database_name('zabbix-server') }
         it { is_expected.to contain_class('zabbix::database::postgresql').with_database_user('zabbix-server') }
         it { is_expected.to contain_class('zabbix::database::postgresql').with_database_password('zabbix-server') }
@@ -97,7 +97,7 @@
         end
 
         it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_type('server') }
-        it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_version('3.2') }
+        it { is_expected.to contain_class('zabbix::database::mysql').with_zabbix_version('3.4') }
         it { is_expected.to contain_class('zabbix::database::mysql').with_database_name('zabbix-server') }
         it { is_expected.to contain_class('zabbix::database::mysql').with_database_user('zabbix-server') }
         it { is_expected.to contain_class('zabbix::database::mysql').with_database_password('zabbix-server') }