Add EL9 support

voxpupuli · Apr 11, 2023 · 667e1af · 667e1af
1 parent 2822e76
commit 667e1af
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 4 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -4,6 +4,8 @@ fixtures:
     augeasproviders_shellvar: 'https://github.com/voxpupuli/puppet-augeasproviders_shellvar.git'
     augeasproviders_core: 'https://github.com/voxpupuli/puppet-augeasproviders_core.git'
     systemd: 'https://github.com/voxpupuli/puppet-systemd.git'
+    epel: 'https://github.com/voxpupuli/puppet-epel.git'
+    yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core.git'
     augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core.git'
     facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
     puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -9,6 +9,7 @@
   Boolean $escape_ldapi_ifs,
   Array[String[1]] $ldapi_ifs,
   Stdlib::Absolutepath $default_directory,
+  Boolean $manage_repo = true,
   Optional[Boolean] $enable_chown                   = undef,
   Optional[Boolean] $service_hasstatus              = undef,
   Boolean $enable                                   = true,

diff --git a/manifests/server/install.pp b/manifests/server/install.pp
@@ -18,6 +18,13 @@
     $responsefile = undef
   }
 
+  if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '9') >= 0 {
+    if $openldap::server::manage_repo {
+      include epel
+      Class['epel'] -> Package[$openldap::server::package]
+    }
+  }
+
   package { $openldap::server::package:
     ensure       => present,
     responsefile => $responsefile,

diff --git a/metadata.json b/metadata.json
@@ -16,6 +16,10 @@
       "name": "puppetlabs/augeas_core",
       "version_requirement": ">= 1.0.0 < 2.0.0"
     },
+    {
+      "name": "puppetlabs/yumrepo_core",
+      "version_requirement": ">= 1.0.0 < 2.0.0"
+    },
     {
       "name": "puppet/augeasproviders_core",
       "version_requirement": ">= 2.0.0 < 4.0.0"
@@ -27,6 +31,10 @@
     {
       "name": "puppet/systemd",
       "version_requirement": ">= 3.0.0 < 5.0.0"
+    },
+    {
+      "name": "puppet/epel",
+      "version_requirement": ">= 4.1.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -61,25 +69,30 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8",
+        "9"
       ]
     },
     {

diff --git a/spec/classes/openldap_server_install_spec.rb b/spec/classes/openldap_server_install_spec.rb
@@ -23,6 +23,18 @@
             is_expected.to contain_package('openldap-servers').with(ensure: :present)
           }
         end
+
+        if (facts[:os]['family'] == 'RedHat') && (facts[:os]['release']['major'].to_s == '9')
+          it { is_expected.to contain_class('epel').that_comes_before('Package[openldap-servers]') }
+        else
+          it { is_expected.not_to contain_class('epel') }
+        end
+
+        context 'when manage_repo => false' do
+          let(:params) { { manage_repo: false } }
+
+          it { is_expected.not_to contain_class('epel') } if (facts[:os]['family'] == 'RedHat') && (facts[:os]['release']['major'].to_s == '9')
+        end
       end
     end
   end