Drop EoL EL7 support

voxpupuli · Jan 24, 2025 · bd4db09 · bd4db09
1 parent d6423b9
commit bd4db09
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -11,7 +11,7 @@
     }
   }
 
-  if $collectd::utils and  ( $facts['os']['family'] == 'Debian' or ( $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'],'8') >= 0 )) {
+  if $collectd::utils and  ( $facts['os']['family'] == 'Debian' or $facts['os']['family'] == 'RedHat' ) {
     package { 'collectd-utils':
       ensure => $collectd::package_ensure,
     }

diff --git a/manifests/plugin/python.pp b/manifests/plugin/python.pp
@@ -31,8 +31,7 @@
     $ensure_real = 'absent'
   }
 
-  if $facts['os']['name'] == 'Amazon' or
-  ($facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'],'8') >= 0) {
+  if $facts['os']['name'] == 'Amazon' or ($facts['os']['family'] == 'RedHat') {
     if $_manage_package {
       package { 'collectd-python':
         ensure => $ensure_real,

diff --git a/manifests/plugin/rabbitmq.pp b/manifests/plugin/rabbitmq.pp
@@ -61,9 +61,7 @@
 ) {
   include collectd
 
-  if $facts['os']['family'] == 'Debian' or
-  $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '8') >= 0 or
-  $facts['os']['name'] == 'Ubuntu' {
+  if $facts['os']['family'] == 'Debian' or $facts['os']['family'] == 'RedHat' {
     fail('https://pypi.org/project/collectd-rabbitmq/ does not support Python 3')
   }
 

diff --git a/manifests/plugin/write_http.pp b/manifests/plugin/write_http.pp
@@ -19,10 +19,10 @@
   if $manage_package !~ Undef {
     $_manage_package = $manage_package
   } else {
-    if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'],'8') >= 0 {
-      $_manage_package = true
+    $_manage_package = if $facts['os']['family'] == 'RedHat' {
+      true
     } else {
-      $_manage_package = false
+      false
     }
   }
   if $_manage_package {

diff --git a/metadata.json b/metadata.json
@@ -33,33 +33,24 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [

diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb
@@ -22,7 +22,7 @@ def baseline_os_hash
     supported_os: [
       {
         'operatingsystem' => 'CentOS',
-        'operatingsystemrelease' => %w[7 8]
+        'operatingsystemrelease' => %w[8 9]
       }
     ]
   }