Skip to content

Commit

Permalink
Support EL 9
Browse files Browse the repository at this point in the history
  • Loading branch information
anders-larsson committed Nov 1, 2022
1 parent 0fc3c2c commit bbf4018
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ v4, v5 and v6 using the ruby versions that are shipped with each. See
* EL 6
* EL 7
* EL 8
* EL 9
* Solaris 10 (client only)
* Solaris 11 (client only)
* Suse 11 (client only)
Expand Down
7 changes: 6 additions & 1 deletion manifests/idmap.pp
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@
$default_idmap_package = 'libnfsidmap'
$default_idmapd_service_ensure = 'stopped'
}
'9': {
$default_idmap_service = 'nfs-idmapd'
$default_idmap_package = 'libnfsidmap'
$default_idmapd_service_ensure = 'stopped'
}
default: {
fail("idmap only supports EL versions 6, 7 and 8. Detected operatingsystemmajrelease is ${::operatingsystemmajrelease}.")
fail("idmap only supports EL versions 6, 7, 8 and 9. Detected operatingsystemmajrelease is ${::operatingsystemmajrelease}.")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
$default_nfs_service_ensure = 'stopped'
$default_nfs_service_enable = false
}
/7|8/: {
/7|8|9/: {
require ::rpcbind
include ::nfs::idmap
$default_nfs_service = undef
Expand Down
12 changes: 8 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,35 @@
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"6",
"7",
"8"
"8",
"9"
]
},
{
Expand Down
10 changes: 9 additions & 1 deletion spec/classes/idmap_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
:idmap_service_name => 'nfs-idmapd',
:pipefs_directory => nil,
},
'el9' => {
:osfamily => 'RedHat',
:release => '9',
:idmapd_service_ensure => 'stopped',
:idmap_package => 'libnfsidmap',
:idmap_service_name => 'nfs-idmapd',
:pipefs_directory => nil,
},
'suse' => {
:osfamily => 'Suse',
:release => '12',
Expand All @@ -37,7 +45,7 @@

unsupported_platforms = {
'el5' => { :osfamily => 'RedHat', :release => '5' },
'el9' => { :osfamily => 'RedHat', :release => '9' },
'el10' => { :osfamily => 'RedHat', :release => '10' },
'solaris9' => { :osfamily => 'Solaris', :kernelrelease => '5.9' },
'weirdos' => { :osfamily => 'WeirdOS', :release => '2.4.2' },
}
Expand Down
13 changes: 12 additions & 1 deletion spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@
:service_enable => false,
:server => true,
},
'el9' => {
:osfamily => 'RedHat',
:release => '9',
:include_idmap => true,
:include_rpcbind => true,
:packages => ['nfs-utils',],
:service => nil,
:service_ensure => 'stopped',
:service_enable => false,
:server => true,
},
'solaris10' => {
:osfamily => 'Solaris',
:kernelrelease => '5.10',
Expand Down Expand Up @@ -82,7 +93,7 @@

unsupported_platforms = {
'el5' => { :osfamily => 'RedHat', :release => '5' },
'el9' => { :osfamily => 'RedHat', :release => '9' },
'el10' => { :osfamily => 'RedHat', :release => '10' },
'suse9' => { :osfamily => 'Suse', :release => '9' },
'suse13' => { :osfamily => 'Suse', :release => '13' },
'solaris9' => { :osfamily => 'Solaris', :kernelrelease => '5.9' },
Expand Down

0 comments on commit bbf4018

Please sign in to comment.