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

22
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
) { ) {
@ -81,16 +82,17 @@ class cloud::volume(
class { 'cinder': class { 'cinder':
sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8", sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8",
rabbit_userid => 'cinder', rabbit_userid => 'cinder',
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_virtual_host => '/', rabbit_virtual_host => '/',
verbose => $verbose, verbose => $verbose,
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': }

20
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
@ -50,15 +51,16 @@ describe 'cloud::volume::controller' do
it 'configure cinder common' do it 'configure cinder common' do
should contain_class('cinder').with( should contain_class('cinder').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:rabbit_userid => 'cinder', :rabbit_userid => 'cinder',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
: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

20
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
@ -64,15 +65,16 @@ describe 'cloud::volume::storage' do
it 'configure cinder common' do it 'configure cinder common' do
should contain_class('cinder').with( should contain_class('cinder').with(
:verbose => true, :verbose => true,
:debug => true, :debug => true,
:rabbit_userid => 'cinder', :rabbit_userid => 'cinder',
:rabbit_hosts => ['10.0.0.1'], :rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secret', :rabbit_password => 'secret',
: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')