openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "Allow blank rabbit password if using transport_url" into stable/newton

This commit is contained in:
Jenkins 2017-01-23 18:15:03 +00:00 committed by Gerrit Code Review
parent e8d69516b9 cf3c7f3466
commit b12abbfc33
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -405,7 +405,7 @@ class cinder (
if $rpc_backend == 'cinder.openstack.common.rpc.impl_kombu' or $rpc_backend == 'rabbit' {
if is_service_default($rabbit_password) {
if is_service_default($default_transport_url) and is_service_default($rabbit_password) {
fail('Please specify a rabbit_password parameter.')
}

8
spec/acceptance/basic_cinder_spec.rb
View File

@ -29,11 +29,9 @@ describe 'basic cinder' do
# Cinder resources
class { '::cinder':
database_connection => 'mysql+pymysql://cinder:a_big_secret@127.0.0.1/cinder?charset=utf8',
rabbit_userid => 'cinder',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => '127.0.0.1',
debug => true,
default_transport_url => 'rabbit://cinder:an_even_bigger_secret@127.0.0.1/',
database_connection => 'mysql+pymysql://cinder:a_big_secret@127.0.0.1/cinder?charset=utf8',
debug => true,
}
class { '::cinder::keystone::auth':
password => 'a_big_secret',