Merge pull request #2196 from puppetlabs/pdksync_IAC-1751/main/add_ro…

…cky_8_support pdksync - (IAC-1751) - Add Support for Rocky 8
puppetlabs · Oct 4, 2021 · 360607a · 360607a
2 parents 4d3702e + d3df050
commit 360607a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/metadata.json b/metadata.json
@@ -70,6 +70,12 @@
         "18.04",
         "20.04"
       ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8"
+      ]
     }
   ],
   "requirements": [

diff --git a/spec/classes/mod/fastcgi_spec.rb b/spec/classes/mod/fastcgi_spec.rb
@@ -17,7 +17,7 @@
           it { is_expected.to contain_apache__mod('fastcgi') }
           it { is_expected.to contain_package('libapache2-mod-fastcgi') }
           it { is_expected.to contain_file('fastcgi.conf') }
-        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific'
+        when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky'
           if facts[:os]['release']['major'].to_i < 7
             it { is_expected.to compile.with_all_deps }
             it { is_expected.to contain_class('apache::params') }

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
@@ -234,7 +234,8 @@
       next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
               (facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES')  ||
               (facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
-              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
+              (facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
+                                                            facts[:os]['name'] == 'Rocky'))
 
       describe 'OS independent tests' do
         context 'with content param' do