diff --git a/README.md b/README.md index 8fd4b04..a80b27e 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/manifests/idmap.pp b/manifests/idmap.pp index ecf375c..8414897 100644 --- a/manifests/idmap.pp +++ b/manifests/idmap.pp @@ -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}.") } } } diff --git a/manifests/init.pp b/manifests/init.pp index 7fb420a..550cc90 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 diff --git a/metadata.json b/metadata.json index 06e8c81..de89e32 100644 --- a/metadata.json +++ b/metadata.json @@ -24,7 +24,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { @@ -32,7 +33,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { @@ -40,7 +42,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { @@ -48,7 +51,8 @@ "operatingsystemrelease": [ "6", "7", - "8" + "8", + "9" ] }, { diff --git a/spec/classes/idmap_spec.rb b/spec/classes/idmap_spec.rb index d8c3273..58ec3ca 100644 --- a/spec/classes/idmap_spec.rb +++ b/spec/classes/idmap_spec.rb @@ -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', @@ -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' }, } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 119e09c..741c9b7 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -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', @@ -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' },