Skip to content

Commit 360607a

Browse files
author
carabasdaniel
authored
Merge pull request #2196 from puppetlabs/pdksync_IAC-1751/main/add_rocky_8_support
pdksync - (IAC-1751) - Add Support for Rocky 8
2 parents 4d3702e + d3df050 commit 360607a

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

metadata.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
"18.04",
7171
"20.04"
7272
]
73+
},
74+
{
75+
"operatingsystem": "Rocky",
76+
"operatingsystemrelease": [
77+
"8"
78+
]
7379
}
7480
],
7581
"requirements": [

spec/classes/mod/fastcgi_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
it { is_expected.to contain_apache__mod('fastcgi') }
1818
it { is_expected.to contain_package('libapache2-mod-fastcgi') }
1919
it { is_expected.to contain_file('fastcgi.conf') }
20-
when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific'
20+
when 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'Rocky'
2121
if facts[:os]['release']['major'].to_i < 7
2222
it { is_expected.to compile.with_all_deps }
2323
it { is_expected.to contain_class('apache::params') }

spec/classes/mod/php_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@
234234
next if (facts[:os]['release']['major'].to_i > 15 && facts[:os]['name'] == 'Ubuntu') ||
235235
(facts[:os]['release']['major'].to_i >= 15 && facts[:os]['name'] == 'SLES') ||
236236
(facts[:os]['release']['major'].to_i >= 9 && facts[:os]['name'] == 'Debian') ||
237-
(facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS'))
237+
(facts[:os]['release']['major'].to_i >= 8 && (facts[:os]['name'] == 'RedHat' || facts[:os]['name'] == 'CentOS' ||
238+
facts[:os]['name'] == 'Rocky'))
238239

239240
describe 'OS independent tests' do
240241
context 'with content param' do

0 commit comments

Comments
 (0)