stackforge/puppet-openstack-cloud
Code Issues Proposed changes

volume: AZ support

Browse Source 
Bring storage_availability_zone support.
This commit is contained in:
Emilien Macchi 2014-05-09 09:30:14 +02:00
parent 23ba374a90
commit 5beaf07f2f
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/volume.pp
View File

@ -66,6 +66,7 @@ class cloud::volume(
$verbose = true, $verbose = true,
$debug = true, $debug = true,
$log_facility = 'LOG_LOCAL0', $log_facility = 'LOG_LOCAL0',
$storage_availability_zone = 'nova',
$use_syslog = true $use_syslog = true
) { ) {
@ -90,7 +91,8 @@ class cloud::volume(
debug => $debug, debug => $debug,
log_dir => $log_dir, log_dir => $log_dir,
log_facility => $log_facility, log_facility => $log_facility,
use_syslog => $use_syslog use_syslog => $use_syslog,
storage_availability_zone => $storage_availability_zone
} }
class { 'cinder::ceilometer': } class { 'cinder::ceilometer': }

4
spec/classes/cloud_volume_controller_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::volume::controller' do
verbose => true, verbose => true,
debug => true, debug => true,
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
storage_availability_zone => 'nova',
use_syslog => true }" use_syslog => true }"
end end
@ -58,7 +59,8 @@ describe 'cloud::volume::controller' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false :log_dir => false,
:storage_availability_zone => 'nova'
) )
should contain_class('cinder::ceilometer') should contain_class('cinder::ceilometer')
end end

4
spec/classes/cloud_volume_storage_spec.rb
View File

@ -32,6 +32,7 @@ describe 'cloud::volume::storage' do
verbose => true, verbose => true,
debug => true, debug => true,
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
storage_availability_zone => 'nova',
use_syslog => true }" use_syslog => true }"
end end
@ -72,7 +73,8 @@ describe 'cloud::volume::storage' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:use_syslog => true, :use_syslog => true,
:log_dir => false :log_dir => false,
:storage_availability_zone => 'nova'
) )
should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier') should contain_cinder_config('DEFAULT/notification_driver').with('value' => 'cinder.openstack.common.notifier.rpc_notifier')