openstack/puppet-cinder
Code Issues Proposed changes

Merge "Add ability to configure control_exchange"

Browse Source
This commit is contained in:
Jenkins 2013-09-09 01:20:54 +00:00 committed by Gerrit Code Review
commit 12ff378709
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -17,6 +17,7 @@ class cinder (
$sql_connection, $sql_connection,
$sql_idle_timeout = '3600', $sql_idle_timeout = '3600',
$rpc_backend = 'cinder.openstack.common.rpc.impl_kombu', $rpc_backend = 'cinder.openstack.common.rpc.impl_kombu',
$control_exchange = 'openstack',
$rabbit_host = '127.0.0.1', $rabbit_host = '127.0.0.1',
$rabbit_port = 5672, $rabbit_port = 5672,
$rabbit_hosts = false, $rabbit_hosts = false,
@ -85,6 +86,7 @@ class cinder (
'DEFAULT/rabbit_password': value => $rabbit_password, secret => true; 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true;
'DEFAULT/rabbit_userid': value => $rabbit_userid; 'DEFAULT/rabbit_userid': value => $rabbit_userid;
'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host; 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host;
'DEFAULT/control_exchange': value => $control_exchange;
} }
if $rabbit_hosts { if $rabbit_hosts {

3
spec/classes/cinder_spec.rb
View File

@ -19,6 +19,9 @@ describe 'cinder' do
should contain_cinder_config('DEFAULT/rpc_backend').with( should contain_cinder_config('DEFAULT/rpc_backend').with(
:value => 'cinder.openstack.common.rpc.impl_kombu' :value => 'cinder.openstack.common.rpc.impl_kombu'
) )
should contain_cinder_config('DEFAULT/control_exchange').with(
:value => 'openstack'
)
should contain_cinder_config('DEFAULT/rabbit_password').with( should contain_cinder_config('DEFAULT/rabbit_password').with(
:value => 'guest', :value => 'guest',
:secret => true :secret => true