openstack
/
puppet-designate
Code Issues Proposed changes

Merge "Change section name for AMQP rabbit parameters"

This commit is contained in:
Jenkins 2015-10-24 09:17:42 +00:00 committed by Gerrit Code Review
parent ce97563841 5f8209f4ec
commit a5c24bdf89
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/init.pp
View File

@ -142,21 +142,21 @@ class designate(
} }
designate_config { designate_config {
'DEFAULT/rabbit_userid' : value => $rabbit_userid; 'oslo_messaging_rabbit/rabbit_userid' : value => $rabbit_userid;
'DEFAULT/rabbit_password' : value => $rabbit_password, secret => true; 'oslo_messaging_rabbit/rabbit_password' : value => $rabbit_password, secret => true;
'DEFAULT/rabbit_virtualhost' : value => $rabbit_virtualhost; 'oslo_messaging_rabbit/rabbit_virtualhost' : value => $rabbit_virtualhost;
} }
if $rabbit_hosts { if $rabbit_hosts {
designate_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') } designate_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($rabbit_hosts, ',') }
designate_config { 'DEFAULT/rabbit_ha_queues': value => true } designate_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true }
designate_config { 'DEFAULT/rabbit_host': ensure => absent } designate_config { 'oslo_messaging_rabbit/rabbit_host': ensure => absent }
designate_config { 'DEFAULT/rabbit_port': ensure => absent } designate_config { 'oslo_messaging_rabbit/rabbit_port': ensure => absent }
} else { } else {
designate_config { 'DEFAULT/rabbit_host': value => $rabbit_host } designate_config { 'oslo_messaging_rabbit/rabbit_host': value => $rabbit_host }
designate_config { 'DEFAULT/rabbit_port': value => $rabbit_port } designate_config { 'oslo_messaging_rabbit/rabbit_port': value => $rabbit_port }
designate_config { 'DEFAULT/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" } designate_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" }
designate_config { 'DEFAULT/rabbit_ha_queues': value => false } designate_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false }
} }
# default setting # default setting

32
spec/classes/designate_init_spec.rb
View File

@ -112,16 +112,16 @@ describe 'designate' do
before { params.merge!( rabbit_non_ha_params ) } before { params.merge!( rabbit_non_ha_params ) }
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_designate_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_userid').with_value( params[:rabbit_userid] )
is_expected.to contain_designate_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] )
is_expected.to contain_designate_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ).with_secret(true) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] ).with_secret(true)
is_expected.to contain_designate_config('DEFAULT/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] )
end end
it { is_expected.to contain_designate_config('DEFAULT/rabbit_host').with_value( params[:rabbit_host] ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_host').with_value( params[:rabbit_host] ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_hosts').with_value( "#{params[:rabbit_host]}:#{params[:rabbit_port]}" ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_hosts').with_value( "#{params[:rabbit_host]}:#{params[:rabbit_port]}" ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_port').with_value( params[:rabbit_port] ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_port').with_value( params[:rabbit_port] ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_ha_queues').with_value( 'false' ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value( 'false' ) }
end end
@ -129,16 +129,16 @@ describe 'designate' do
before { params.merge!( rabbit_ha_params ) } before { params.merge!( rabbit_ha_params ) }
it 'configures rabbit' do it 'configures rabbit' do
is_expected.to contain_designate_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_userid').with_value( params[:rabbit_userid] )
is_expected.to contain_designate_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] )
is_expected.to contain_designate_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ).with_secret(true) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] ).with_secret(true)
is_expected.to contain_designate_config('DEFAULT/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] ) is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_virtualhost').with_value( params[:rabbit_virtualhost] )
end end
it { is_expected.to contain_designate_config('DEFAULT/rabbit_host').with_ensure( 'absent' ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_host').with_ensure( 'absent' ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_hosts').with_value( '10.0.0.1:5672,10.0.0.2:5672,10.0.0.3:5672' ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_hosts').with_value( '10.0.0.1:5672,10.0.0.2:5672,10.0.0.3:5672' ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_port').with_ensure( 'absent' ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_port').with_ensure( 'absent' ) }
it { is_expected.to contain_designate_config('DEFAULT/rabbit_ha_queues').with_value( 'true' ) } it { is_expected.to contain_designate_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value( 'true' ) }
end end