Remove EL7 support

voxpupuli · Jul 1, 2024 · 0039be4 · 0039be4
1 parent 5db0077
commit 0039be4
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 186 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -130,8 +130,6 @@
 
   if downcase($facts['kernel']) == 'windows' {
     $zabbix_version = '4.4.5'
-  } elsif $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7' {
-    $zabbix_version = '5.0'
   } else {
     $zabbix_version = '6.0'
   }

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -21,7 +21,7 @@
     case $facts['os']['family'] {
       'RedHat': {
         $majorrelease = $facts['os']['release']['major']
-        if (versioncmp(fact('os.release.major'), '7') >= 0 and $zabbix_version == '7.0') {
+        if (versioncmp(fact('os.release.major'), '8') >= 0 and $zabbix_version == '7.0') {
           $gpgkey_zabbix = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'
           $gpgkey_nonsupported = 'https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005'
         } elsif versioncmp(fact('os.release.major'), '9') >= 0 {
@@ -59,43 +59,6 @@
           gpgkey   => $gpgkey_nonsupported,
           priority => '1',
         }
-
-        # Zabbix 5.0 frontend on EL7 has different location.
-        if ($majorrelease == '7' and $zabbix_version == '5.0') {
-          $_frontend_repo_location = $frontend_repo_location ? {
-            undef   => "https://repo.zabbix.com/zabbix/${zabbix_version}/rhel/${majorrelease}/\$basearch/frontend",
-            default => $frontend_repo_location,
-          }
-
-          yumrepo { 'zabbix-frontend':
-            name     => "Zabbix_frontend_${majorrelease}_${facts['os']['architecture']}",
-            descr    => "Zabbix_frontend_${majorrelease}_${facts['os']['architecture']}",
-            baseurl  => $_frontend_repo_location,
-            gpgcheck => '1',
-            gpgkey   => $gpgkey_zabbix,
-            priority => '1',
-          }
-        }
-
-        if ($facts['os']['release']['major'] == '7') {
-          case $facts['os']['name'] {
-            'CentOS': {
-              $scl_package_name = 'centos-release-scl'
-            }
-            'OracleLinux': {
-              $scl_package_name = 'oracle-softwarecollection-release-el7'
-            }
-            default: {
-              $scl_package_name = undef
-            }
-          }
-          if $scl_package_name {
-            package { 'zabbix-required-scl-repo':
-              ensure => 'latest',
-              name   => $scl_package_name,
-            }
-          }
-        }
       }
       'Debian': {
         if ($manage_apt) {

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -281,14 +281,6 @@
   Optional[String[1]] $hanodename                                             = $zabbix::params::server_hanodename,
   Optional[String[1]] $nodeaddress                                            = $zabbix::params::server_nodeaddress,
 ) inherits zabbix::params {
-  # zabbix server 5.2, 5.4 and 6.0 is not supported on RHEL 7.
-  # https://www.zabbix.com/documentation/current/manual/installation/install_from_packages/rhel_centos
-  if $facts['os']['family'] == 'RedHat' and versioncmp($zabbix_version, '5.2') >= 0 {
-    if versioncmp($facts['os']['release']['major'], '7') == 0 {
-      fail("${facts['os']['family']} ${$facts['os']['release']['major']} is not supported for zabbix::server (version ${$zabbix_version}) (yet)")
-    }
-  }
-
   # Only include the repo class if it has not yet been included
   unless defined(Class['Zabbix::Repo']) {
     class { 'zabbix::repo':

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -210,24 +210,6 @@
         ],
       }
     }
-    'RedHat': {
-      $zabbix_web_package = 'zabbix-web'
-      if ($facts['os']['release']['major'] == '7') {
-        package { "zabbix-web-${db}-scl":
-          ensure  => $zabbix_package_state,
-          before  => Package[$zabbix_web_package],
-          require => Class['zabbix::repo'],
-          tag     => 'zabbix',
-        }
-      } else {
-        package { "zabbix-web-${db}":
-          ensure  => $zabbix_package_state,
-          before  => Package[$zabbix_web_package],
-          require => Class['zabbix::repo'],
-          tag     => 'zabbix',
-        }
-      }
-    }
     default: {
       $zabbix_web_package = 'zabbix-web'
 
@@ -279,26 +261,18 @@
     include apache
     include apache::mod::dir
     if $facts['os']['family'] == 'RedHat' {
-      if $facts['os']['release']['major'] == '7' {
-        $fpm_service = 'rh-php72-php-fpm'
-        # PHP parameters are moved to /etc/opt/rh/rh-php72/php-fpm.d/zabbix.conf per package zabbix-web-deps-scl
-        $fpm_scl_prefix = '/opt/rh/rh-php72'
-      } else {
-        $fpm_service = 'php-fpm'
-        $fpm_scl_prefix = ''
-      }
       include apache::mod::proxy
       include apache::mod::proxy_fcgi
       $apache_vhost_custom_fragment = ''
 
-      service { $fpm_service:
+      service { 'php-fpm':
         ensure => 'running',
         enable => true,
       }
 
-      file { "/etc${fpm_scl_prefix}/php-fpm.d/zabbix.conf":
+      file { '/etc/php-fpm.d/zabbix.conf':
         ensure  => file,
-        notify  => Service[$fpm_service],
+        notify  => Service['php-fpm'],
         content => epp('zabbix/web/php-fpm.d.zabbix.conf.epp'),
       }
 
@@ -311,7 +285,7 @@
               'php',
               'phar',
             ],
-            handler => "proxy:unix:/var${fpm_scl_prefix}/run/php-fpm/zabbix.sock|fcgi://localhost",
+            handler => 'proxy:unix:/var/run/php-fpm/zabbix.sock|fcgi://localhost',
           },
         ],
       }

diff --git a/metadata.json b/metadata.json
@@ -59,23 +59,20 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "9"
       ]
     },

diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
@@ -66,8 +66,6 @@
 
       context 'with all defaults' do
         it { is_expected.to contain_selinux__module('zabbix-agent') }            if facts[:os]['family'] == 'RedHat'
-        it { is_expected.to contain_yumrepo('zabbix-frontend') }                 if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-        it { is_expected.to contain_package('zabbix-required-scl-repo') }        if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         it { is_expected.to contain_apt__key('zabbix-A1848F5') }                 if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_apt__key('zabbix-FBABD5F') }                 if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_file(include_dir).with_ensure('directory') }

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -28,15 +28,7 @@
       end
 
       supported_versions.each do |zabbix_version|
-        path = if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-                 # Path on EL7
-                 if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
-                   '/usr/share/zabbix-sql-scripts/postgresql/'
-                 else
-                   "/usr/share/doc/zabbix-*-pgsql-#{zabbix_version}*/"
-                 end
-               # Path on Debian and EL8
-               elsif Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
+        path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
                  '/usr/share/zabbix-sql-scripts/postgresql/'
                else
                  '/usr/share/doc/zabbix-*-pgsql'

diff --git a/spec/classes/javagateway_spec.rb b/spec/classes/javagateway_spec.rb
@@ -27,8 +27,6 @@
         it { is_expected.to contain_service('zabbix-java-gateway').with_enable('true') }
         it { is_expected.to contain_service('zabbix-java-gateway').with_require(['Package[zabbix-java-gateway]', 'File[/etc/zabbix/zabbix_java_gateway.conf]']) }
 
-        it { is_expected.to contain_yumrepo('zabbix-frontend') }          if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-        it { is_expected.to contain_package('zabbix-required-scl-repo') } if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         it { is_expected.to contain_apt__key('zabbix-A1848F5') }          if facts[:os]['family'] == 'Debian'
         it { is_expected.to contain_apt__key('zabbix-FBABD5F') }          if facts[:os]['family'] == 'Debian'
       end

diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
@@ -21,11 +21,7 @@
         }
       end
 
-      zabbix_version = if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-                         '5.0'
-                       else
-                         '6.0'
-                       end
+      zabbix_version = '6.0'
 
       it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf.d').with_ensure('directory') }
       it { is_expected.to contain_file('/etc/zabbix/zabbix_proxy.conf.d').with_require('File[/etc/zabbix/zabbix_proxy.conf]') }

diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
@@ -84,52 +84,49 @@
         end
 
         case facts[:os]['release']['major']
-        when '7'
-          context 'on RedHat 7 and Zabbix 5.0' do
+        when '8', '9'
+          major = facts[:os]['release']['major']
+
+          context "on RedHat #{major} and Zabbix 5.0" do
             let :params do
               {
                 zabbix_version: '5.0',
                 manage_repo: true
               }
             end
 
-            it { is_expected.to contain_yumrepo('zabbix').with_baseurl('https://repo.zabbix.com/zabbix/5.0/rhel/7/$basearch/') }
-            it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591') }
-            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl('https://repo.zabbix.com/non-supported/rhel/7/$basearch/') }
-            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-79EA5ED4') }
-            it { is_expected.to contain_yumrepo('zabbix-frontend') }
-
-            it { is_expected.to contain_package('zabbix-required-scl-repo').with_ensure('latest').with_name('centos-release-scl') } if facts[:os]['name'] == 'CentOS'
-            it { is_expected.to contain_package('zabbix-required-scl-repo').with_ensure('latest').with_name('oracle-softwarecollection-release-el7') } if facts[:os]['name'] == 'OracleLinux'
+            it { is_expected.to contain_yumrepo('zabbix').with_baseurl("https://repo.zabbix.com/zabbix/5.0/rhel/#{major}/$basearch/") }
+            it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
+            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl("https://repo.zabbix.com/non-supported/rhel/#{major}/$basearch/") }
+            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
           end
-        when '9'
 
-          context 'on RedHat 9 and Zabbix 5.0' do
+          context 'on RedHat 9 and Zabbix 6.0' do
             let :params do
               {
-                zabbix_version: '5.0',
+                zabbix_version: '6.0',
                 manage_repo: true
               }
             end
 
-            it { is_expected.to contain_yumrepo('zabbix').with_baseurl('https://repo.zabbix.com/zabbix/5.0/rhel/9/$basearch/') }
+            it { is_expected.to contain_yumrepo('zabbix').with_baseurl("https://repo.zabbix.com/zabbix/6.0/rhel/#{major}/$basearch/") }
             it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
-            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl('https://repo.zabbix.com/non-supported/rhel/9/$basearch/') }
+            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl("https://repo.zabbix.com/non-supported/rhel/#{major}/$basearch/") }
             it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
           end
 
-          context 'on RedHat 9 and Zabbix 6.0' do
+          context 'on RedHat 9 and Zabbix 7.0' do
             let :params do
               {
-                zabbix_version: '6.0',
+                zabbix_version: '7.0',
                 manage_repo: true
               }
             end
 
-            it { is_expected.to contain_yumrepo('zabbix').with_baseurl('https://repo.zabbix.com/zabbix/6.0/rhel/9/$basearch/') }
-            it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
-            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl('https://repo.zabbix.com/non-supported/rhel/9/$basearch/') }
-            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD') }
+            it { is_expected.to contain_yumrepo('zabbix').with_baseurl("https://repo.zabbix.com/zabbix/6.0/rhel/#{major}/$basearch/") }
+            it { is_expected.to contain_yumrepo('zabbix').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') }
+            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_baseurl("https://repo.zabbix.com/non-supported/rhel/#{major}/$basearch/") }
+            it { is_expected.to contain_yumrepo('zabbix-nonsupported').with_gpgkey('https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-B5333005') }
           end
         end
       end

diff --git a/spec/classes/sender_spec.rb b/spec/classes/sender_spec.rb
@@ -15,11 +15,7 @@
         facts
       end
 
-      zabbix_version = if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-                         '5.0'
-                       else
-                         '6.0'
-                       end
+      zabbix_version = '6.0'
 
       context 'with all defaults' do
         it { is_expected.to contain_class('zabbix::sender') }
@@ -48,9 +44,6 @@
         when 'RedHat'
           it { is_expected.to contain_yumrepo('zabbix-nonsupported') }
           it { is_expected.to contain_yumrepo('zabbix') }
-
-          it { is_expected.to contain_yumrepo('zabbix-frontend') }          if facts[:os]['release']['major'] == '7'
-          it { is_expected.to contain_package('zabbix-required-scl-repo') } if facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         when 'Debian'
           it { is_expected.to contain_apt__source('zabbix') }
           it { is_expected.to contain_apt__key('zabbix-A1848F5') }

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -15,11 +15,7 @@
     context "on #{os}" do
       let(:facts) { facts }
 
-      zabbix_version = if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'] == '7'
-                         '5.0'
-                       else
-                         '6.0'
-                       end
+      zabbix_version = '6.0'
 
       describe 'with default settings' do
         it { is_expected.to contain_class('zabbix::repo') }
@@ -52,9 +48,6 @@
         describe 'with defaults' do
           it { is_expected.to contain_yumrepo('zabbix-nonsupported') }
           it { is_expected.to contain_yumrepo('zabbix') }
-
-          it { is_expected.to contain_yumrepo('zabbix-frontend') }          if facts[:os]['release']['major'] == '7'
-          it { is_expected.to contain_package('zabbix-required-scl-repo') } if facts[:os]['release']['major'] == '7' && %w[OracleLinux CentOS].include?(facts[:os]['name'])
         end
       end
 
@@ -274,7 +267,7 @@
             valuecachesize: '4M',
             vmwarecachesize: '8M',
             vmwarefrequency: '60',
-            zabbix_version: '5.0',
+            zabbix_version: '6.0',
             tlsciphercert: 'EECDH+aRSA+AES128:RSA+aRSA+AES128',
             tlsciphercert13: 'EECDH+aRSA+AES128:RSA+aRSA+AES128',
             tlscipherpsk: 'kECDHEPSK+AES128:kPSK+AES128',
@@ -359,12 +352,12 @@
         it { is_expected.to contain_file('/etc/zabbix/zabbix_server.conf').with_content %r{^TLSCipherAll13=EECDH\+aRSA\+AES128:RSA\+aRSA\+AES128:kECDHEPSK\+AES128:kPSK\+AES128$} }
       end
 
-      context 'with zabbix_server.conf and version 5.0' do
+      context 'with zabbix_server.conf and version 6.0' do
         let :params do
           {
             socketdir: '/var/run/zabbix',
             startodbcpollers: 1,
-            zabbix_version: '5.0'
+            zabbix_version: '6.0'
           }
         end