From 5beaf07f2f7a01c6c64bac05d105b272c058b00b Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 9 May 2014 09:30:14 +0200 Subject: [PATCH] volume: AZ support Bring storage_availability_zone support. --- manifests/volume.pp | 22 +++++++++++--------- spec/classes/cloud_volume_controller_spec.rb | 20 ++++++++++-------- spec/classes/cloud_volume_storage_spec.rb | 20 ++++++++++-------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 60c7a9ec..eaacaf47 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -66,6 +66,7 @@ class cloud::volume( $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', + $storage_availability_zone = 'nova', $use_syslog = true ) { @@ -81,16 +82,17 @@ class cloud::volume( class { 'cinder': - sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", - rabbit_userid => 'cinder', - rabbit_hosts => $rabbit_hosts, - rabbit_password => $rabbit_password, - rabbit_virtual_host => '/', - verbose => $verbose, - debug => $debug, - log_dir => $log_dir, - log_facility => $log_facility, - use_syslog => $use_syslog + sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", + rabbit_userid => 'cinder', + rabbit_hosts => $rabbit_hosts, + rabbit_password => $rabbit_password, + rabbit_virtual_host => '/', + verbose => $verbose, + debug => $debug, + log_dir => $log_dir, + log_facility => $log_facility, + use_syslog => $use_syslog, + storage_availability_zone => $storage_availability_zone } class { 'cinder::ceilometer': } diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index 13f0d315..6e28b264 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::volume::controller' do verbose => true, debug => true, log_facility => 'LOG_LOCAL0', + storage_availability_zone => 'nova', use_syslog => true }" end @@ -50,15 +51,16 @@ describe 'cloud::volume::controller' do it 'configure cinder common' do should contain_class('cinder').with( - :verbose => true, - :debug => true, - :rabbit_userid => 'cinder', - :rabbit_hosts => ['10.0.0.1'], - :rabbit_password => 'secrete', - :rabbit_virtual_host => '/', - :log_facility => 'LOG_LOCAL0', - :use_syslog => true, - :log_dir => false + :verbose => true, + :debug => true, + :rabbit_userid => 'cinder', + :rabbit_hosts => ['10.0.0.1'], + :rabbit_password => 'secrete', + :rabbit_virtual_host => '/', + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, + :log_dir => false, + :storage_availability_zone => 'nova' ) should contain_class('cinder::ceilometer') end diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 01052770..134e3bde 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -32,6 +32,7 @@ describe 'cloud::volume::storage' do verbose => true, debug => true, log_facility => 'LOG_LOCAL0', + storage_availability_zone => 'nova', use_syslog => true }" end @@ -64,15 +65,16 @@ describe 'cloud::volume::storage' do it 'configure cinder common' do should contain_class('cinder').with( - :verbose => true, - :debug => true, - :rabbit_userid => 'cinder', - :rabbit_hosts => ['10.0.0.1'], - :rabbit_password => 'secret', - :rabbit_virtual_host => '/', - :log_facility => 'LOG_LOCAL0', - :use_syslog => true, - :log_dir => false + :verbose => true, + :debug => true, + :rabbit_userid => 'cinder', + :rabbit_hosts => ['10.0.0.1'], + :rabbit_password => 'secret', + :rabbit_virtual_host => '/', + :log_facility => 'LOG_LOCAL0', + :use_syslog => true, + :log_dir => false, + :storage_availability_zone => 'nova' ) should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')