stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Add nfs_mount_options to cinder when using NetApp as a backend."

Browse Source
This commit is contained in:
Jenkins
2015-04-27 10:26:01 +00:00
committed by Gerrit Code Review
parent a813d4c2bc c4da5b9777
commit c9ba99acaf
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile
View File

@@ -25,7 +25,7 @@ mod 'ceilometer',
:ref => 'c5c7f4a6a7afd4b9c558e17e5a755e836e182dbe' :ref => 'c5c7f4a6a7afd4b9c558e17e5a755e836e182dbe'
mod 'cinder', mod 'cinder',
:git => 'git://github.com/enovance/puppet-cinder.git', :git => 'git://github.com/enovance/puppet-cinder.git',
:ref => 'bde992600a63a3debba4b06a27d7cde9119f23ed' :ref => '3247b8e9844afa0b7b1ddc0bff5361c6f0811e5d'
mod 'glance', mod 'glance',
:git => 'git://github.com/enovance/puppet-glance.git', :git => 'git://github.com/enovance/puppet-glance.git',
:ref => '9fb3db4a693b6839c2caa45df4cd37f9c21451de' :ref => '9fb3db4a693b6839c2caa45df4cd37f9c21451de'

7
manifests/volume/backend/netapp.pp
View File

@@ -111,6 +111,11 @@
# (optional) File with the list of available NFS shares # (optional) File with the list of available NFS shares
# Defaults to '' # 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 ( define cloud::volume::backend::netapp (
$netapp_login, $netapp_login,
$netapp_password, $netapp_password,
@@ -128,6 +133,7 @@ define cloud::volume::backend::netapp (
$thres_avl_size_perc_start = '20', $thres_avl_size_perc_start = '20',
$thres_avl_size_perc_stop = '60', $thres_avl_size_perc_stop = '60',
$nfs_shares_config = '', $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_start => $thres_avl_size_perc_start,
thres_avl_size_perc_stop => $thres_avl_size_perc_stop, thres_avl_size_perc_stop => $thres_avl_size_perc_stop,
nfs_shares_config => $nfs_shares_config, nfs_shares_config => $nfs_shares_config,
nfs_mount_options => $nfs_mount_options,
} }
@cinder::type { $volume_backend_name: @cinder::type { $volume_backend_name:

4
spec/classes/cloud_volume_storage_spec.rb
View File

@@ -54,7 +54,8 @@ describe 'cloud::volume::storage' do
'premium' => { 'premium' => {
'netapp_server_hostname' => 'netapp-server.host', 'netapp_server_hostname' => 'netapp-server.host',
'netapp_login' => 'joe', 'netapp_login' => 'joe',
'netapp_password' => 'secret' 'netapp_password' => 'secret',
'nfs_mount_options' => 'rw,proto=tcp,sec=sys',
} }
}, },
'iscsi' => { '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_login').with_value('joe')
is_expected.to contain_cinder_config('premium/netapp_password').with_value('secret') 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/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( is_expected.to contain_cinder__type('premium').with(
:set_key => 'volume_backend_name', :set_key => 'volume_backend_name',
:set_value => 'premium', :set_value => 'premium',