openstack
/
puppet-cinder
Code Issues Proposed changes

Add support for allow_availability_zone_fallback parameter 

Change-Id: I27cb18bf486e93bc1893fa6bd81a786a23157c90
This commit is contained in:
Charles Llewellyn 2016-08-17 11:13:35 +01:00
parent a97128fb2b
commit 100184ee3b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@ -239,6 +239,10 @@
# the default for new volumes.
# Defaults to false
#
# [*allow_availability_zone_fallback*]
# (optional) Allow availability zone fallback if preferred availabilty zone cannot be deployed to.
# Defaults to $::os_service_default
#
# [*api_paste_config*]
# (Optional)
# Defaults to '/etc/cinder/api-paste.ini',
@ -357,6 +361,7 @@ class cinder (
$debug = undef,
$storage_availability_zone = 'nova',
$default_availability_zone = false,
$allow_availability_zone_fallback = $::os_service_default,
$enable_v3_api = true,
$lock_path = $::cinder::params::lock_path,
$image_conversion_dir = $::os_service_default,
@ -462,13 +467,14 @@ class cinder (
}
cinder_config {
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/api_paste_config': value => $api_paste_config;
'DEFAULT/storage_availability_zone': value => $storage_availability_zone;
'DEFAULT/default_availability_zone': value => $default_availability_zone_real;
'DEFAULT/image_conversion_dir': value => $image_conversion_dir;
'DEFAULT/host': value => $host;
'DEFAULT/report_interval': value => $report_interval;
'DEFAULT/service_down_time': value => $service_down_time;
'DEFAULT/api_paste_config': value => $api_paste_config;
'DEFAULT/storage_availability_zone': value => $storage_availability_zone;
'DEFAULT/default_availability_zone': value => $default_availability_zone_real;
'DEFAULT/allow_availability_zone_fallback': value => $allow_availability_zone_fallback;
'DEFAULT/image_conversion_dir': value => $image_conversion_dir;
'DEFAULT/host': value => $host;
}
# V3 APIs

1
spec/classes/cinder_spec.rb
View File

@ -50,6 +50,7 @@ describe 'cinder' do
is_expected.to contain_cinder_config('oslo_messaging_rabbit/kombu_compression').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova')
is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova')
is_expected.to contain_cinder_config('DEFAULT/allow_availability_zone_fallback').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')
is_expected.to contain_cinder_config('oslo_concurrency/lock_path').with(:value => '/var/lock/cinder')
end