stackforge/puppet-openstack
Code Issues Proposed changes

ensure controller sets cinder's rabbit user

Browse Source 
Previously, the controller was not correctly
updating the rabbit_userid for the cinder
controller when it was passed in as a class
parameter to openstack::controller.

This patch resolves that issue.

Change-Id: I53e3c06cc400c25d24da8d35cf5874ba7f9879e8
This commit is contained in:
Dan Bode
2013-05-31 15:49:43 -07:00
parent 986a928f6c
commit ea39c77584
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/controller.pp
View File

@@ -403,6 +403,7 @@ class openstack::controller (
bind_host => $cinder_bind_address,
keystone_auth_host => $keystone_host,
keystone_password => $cinder_user_password,
rabbit_userid => $rabbit_user,
rabbit_password => $rabbit_password,
rabbit_host => $rabbit_host,
db_password => $cinder_db_password,

4
spec/classes/openstack_controller_spec.rb
View File

@@ -455,6 +455,7 @@ describe 'openstack::controller' do
let :params do
default_params.merge(
:verbose => 'True',
:rabbit_user => 'rabbituser',
:rabbit_password => 'rabbit_pw2',
:cinder_user_password => 'foo',
:cinder_db_password => 'bar',
@@ -467,7 +468,8 @@ describe 'openstack::controller' do
should contain_class('cinder').with(
:verbose => 'True',
:sql_connection => 'mysql://baz:bar@127.0.0.2/blah?charset=utf8',
:rabbit_password => 'rabbit_pw2'
:rabbit_password => 'rabbit_pw2',
:rabbit_userid => 'rabbituser'
)
should contain_class('cinder::api').with_keystone_password('foo')
should contain_class('cinder::scheduler')