Merge pull request voxpupuli#179 from saz/remove-eol-redhat

Remove eol redhat

Author: ju5t

manifests/params.pp

@@ -6,18 +6,9 @@
 
   case $facts['os']['family'] {
     'RedHat': {
-      case $facts['os']['release']['major'] {
-        '7': {
-          $mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.1.14/schema.mysql.sql'
-          $pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.1.14/schema.pgsql.sql'
-          $sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.1.14/schema.sqlite.sql'
-        }
-        default: {
-          $mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.8.1/schema.mysql.sql'
-          $pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.8.1/schema.pgsql.sql'
-          $sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.8.1/schema.sqlite.sql'
-        }
-      }
+      $mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.8.1/schema.mysql.sql'
+      $pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.8.1/schema.pgsql.sql'
+      $sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.8.1/schema.sqlite.sql'
       $authoritative_package = 'pdns'
       $authoritative_service = 'pdns'
       $authoritative_config = '/etc/pdns/pdns.conf'

manifests/repo.pp

@@ -14,30 +14,21 @@
       Yumrepo['powerdns'] -> Package <| title == $powerdns::params::authoritative_package |>
       Yumrepo['powerdns-recursor'] -> Package <| title == $powerdns::params::recursor_package |>
 
-      if versioncmp($facts['os']['release']['major'], '7') <= 0 {
-        stdlib::ensure_packages('yum-plugin-priorities')
-
-        Package['yum-plugin-priorities']
-        -> Yumrepo['powerdns']
+      if ($facts['os']['name'] == 'Rocky') {
+        $mirrorlist = "https://mirrors.rockylinux.org/mirrorlist?arch=\$basearch&repo=PowerTools-\$releasever"
+        $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
+      } else {
+        $mirrorlist = "http://mirrorlist.centos.org/?release=\$releasever&arch=\$basearch&repo=PowerTools&infra=\$infra"
+        $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
       }
 
-      if versioncmp($facts['os']['release']['major'], '8') >= 0 {
-        if ($facts['os']['name'] == 'Rocky') {
-          $mirrorlist = "https://mirrors.rockylinux.org/mirrorlist?arch=\$basearch&repo=PowerTools-\$releasever"
-          $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial'
-        } else {
-          $mirrorlist = "http://mirrorlist.centos.org/?release=\$releasever&arch=\$basearch&repo=PowerTools&infra=\$infra"
-          $gpgkey = 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial'
-        }
-
-        yumrepo { 'powertools':
-          ensure     => 'present',
-          descr      => 'PowerTools',
-          mirrorlist => $mirrorlist,
-          enabled    => 'true',
-          gpgkey     => $gpgkey,
-          gpgcheck   => 'true',
-        }
+      yumrepo { 'powertools':
+        ensure     => 'present',
+        descr      => 'PowerTools',
+        mirrorlist => $mirrorlist,
+        enabled    => 'true',
+        gpgkey     => $gpgkey,
+        gpgcheck   => 'true',
       }
 
       yumrepo { 'powerdns':

metadata.json

@@ -47,7 +47,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]