diff --git a/Puppetfile b/Puppetfile index 979432c9..5e269a27 100644 --- a/Puppetfile +++ b/Puppetfile @@ -25,7 +25,7 @@ mod 'ceilometer', :ref => 'c5c7f4a6a7afd4b9c558e17e5a755e836e182dbe' mod 'cinder', :git => 'git://github.com/enovance/puppet-cinder.git', - :ref => 'bde992600a63a3debba4b06a27d7cde9119f23ed' + :ref => '3247b8e9844afa0b7b1ddc0bff5361c6f0811e5d' mod 'glance', :git => 'git://github.com/enovance/puppet-glance.git', :ref => '9fb3db4a693b6839c2caa45df4cd37f9c21451de' diff --git a/manifests/volume/backend/netapp.pp b/manifests/volume/backend/netapp.pp index 273f84f1..83cbec5f 100644 --- a/manifests/volume/backend/netapp.pp +++ b/manifests/volume/backend/netapp.pp @@ -111,6 +111,11 @@ # (optional) File with the list of available NFS shares # Defaults to '' # +# [*nfs_mount_options*] +# (optional) Mount options passed to the nfs client. See section +# of the nfs man page for details. +# Defaults to undef + define cloud::volume::backend::netapp ( $netapp_login, $netapp_password, @@ -128,6 +133,7 @@ define cloud::volume::backend::netapp ( $thres_avl_size_perc_start = '20', $thres_avl_size_perc_stop = '60', $nfs_shares_config = '', + $nfs_mount_options = undef, ) { @@ -147,6 +153,7 @@ define cloud::volume::backend::netapp ( thres_avl_size_perc_start => $thres_avl_size_perc_start, thres_avl_size_perc_stop => $thres_avl_size_perc_stop, nfs_shares_config => $nfs_shares_config, + nfs_mount_options => $nfs_mount_options, } @cinder::type { $volume_backend_name: diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index c7b5f012..a50d7af3 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -54,7 +54,8 @@ describe 'cloud::volume::storage' do 'premium' => { 'netapp_server_hostname' => 'netapp-server.host', 'netapp_login' => 'joe', - 'netapp_password' => 'secret' + 'netapp_password' => 'secret', + 'nfs_mount_options' => 'rw,proto=tcp,sec=sys', } }, 'iscsi' => { @@ -171,6 +172,7 @@ describe 'cloud::volume::storage' do is_expected.to contain_cinder_config('premium/netapp_login').with_value('joe') is_expected.to contain_cinder_config('premium/netapp_password').with_value('secret') is_expected.to contain_cinder_config('premium/netapp_server_hostname').with_value('netapp-server.host') + is_expected.to contain_cinder_config('premium/nfs_mount_options').with_value('rw,proto=tcp,sec=sys') is_expected.to contain_cinder__type('premium').with( :set_key => 'volume_backend_name', :set_value => 'premium',