diff --git a/manifests/backend/ganesha.pp b/manifests/backend/ganesha.pp index 1ece2211..114a0e31 100644 --- a/manifests/backend/ganesha.pp +++ b/manifests/backend/ganesha.pp @@ -83,12 +83,8 @@ define manila::backend::ganesha ( "${share_backend_name}/ganesha_rados_export_index": value => $ganesha_rados_export_index; } - if ($::osfamily == 'RedHat') { - ensure_packages( 'nfs-ganesha', { - ensure => present, - tag => ['openstack', 'manila-support-package'], - }) - } else { - warning("Unsupported osfamily ${::osfamily}, Red Hat is the only supported platform.") - } + ensure_packages( 'nfs-ganesha', { + ensure => present, + tag => ['openstack', 'manila-support-package'], + }) } diff --git a/releasenotes/notes/ganesha-ubuntu-a7f1714bed431c03.yaml b/releasenotes/notes/ganesha-ubuntu-a7f1714bed431c03.yaml new file mode 100644 index 00000000..8f7912ce --- /dev/null +++ b/releasenotes/notes/ganesha-ubuntu-a7f1714bed431c03.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``manila::backend::ganesha`` defined resource type now supports Ubuntu + and Debian. diff --git a/spec/defines/manila_backend_ganesha_spec.rb b/spec/defines/manila_backend_ganesha_spec.rb index 66bfd3b7..dab85a62 100644 --- a/spec/defines/manila_backend_ganesha_spec.rb +++ b/spec/defines/manila_backend_ganesha_spec.rb @@ -10,6 +10,11 @@ describe 'manila::backend::ganesha' do {} end + it { is_expected.to contain_package('nfs-ganesha').with( + :name => 'nfs-ganesha', + :ensure => 'installed' + ) } + it 'set the default values' do is_expected.to contain_manila_config('ganesha/ganesha_config_dir').with_value('') is_expected.to contain_manila_config('ganesha/ganesha_config_path').with_value('') @@ -48,15 +53,6 @@ describe 'manila::backend::ganesha' do end end - shared_examples_for 'manila::backend::ganesha on RedHat' do - let(:title) {'ganesha'} - - it { is_expected.to contain_package('nfs-ganesha').with( - :name => 'nfs-ganesha', - :ensure => 'installed' - ) } - end - on_supported_os({ :supported_os => OSDefaults.get_supported_os }).each do |os,facts| @@ -65,9 +61,6 @@ describe 'manila::backend::ganesha' do facts.merge!(OSDefaults.get_facts({ :fqdn => 'some.host.tld'})) end it_configures 'manila::backend::ganesha' - if facts[:osfamily] == 'RedHat' - it_configures 'manila::backend::ganesha on RedHat' - end end end end