openstack
/
puppet-heat
Code Issues Proposed changes

Merge "Change section name for AMQP qpid parameters"

This commit is contained in:
Jenkins 2015-10-22 10:47:54 +00:00 committed by Gerrit Code Review
parent 1c4d0bba2a 65df5d530b
commit d7ca0ce559
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/init.pp
View File

@ -423,20 +423,20 @@ class heat(
if $rpc_backend == 'qpid' {
heat_config {
'DEFAULT/qpid_hostname' : value => $qpid_hostname;
'DEFAULT/qpid_port' : value => $qpid_port;
'DEFAULT/qpid_username' : value => $qpid_username;
'DEFAULT/qpid_password' : value => $qpid_password, secret => true;
'DEFAULT/qpid_heartbeat' : value => $qpid_heartbeat;
'DEFAULT/qpid_protocol' : value => $qpid_protocol;
'DEFAULT/qpid_tcp_nodelay' : value => $qpid_tcp_nodelay;
'DEFAULT/qpid_reconnect' : value => $qpid_reconnect;
'DEFAULT/qpid_reconnect_timeout' : value => $qpid_reconnect_timeout;
'DEFAULT/qpid_reconnect_limit' : value => $qpid_reconnect_limit;
'DEFAULT/qpid_reconnect_interval_min' : value => $qpid_reconnect_interval_min;
'DEFAULT/qpid_reconnect_interval_max' : value => $qpid_reconnect_interval_max;
'DEFAULT/qpid_reconnect_interval' : value => $qpid_reconnect_interval;
'DEFAULT/amqp_durable_queues' : value => $amqp_durable_queues;
'oslo_messaging_qpid/qpid_hostname' : value => $qpid_hostname;
'oslo_messaging_qpid/qpid_port' : value => $qpid_port;
'oslo_messaging_qpid/qpid_username' : value => $qpid_username;
'oslo_messaging_qpid/qpid_password' : value => $qpid_password, secret => true;
'oslo_messaging_qpid/qpid_heartbeat' : value => $qpid_heartbeat;
'oslo_messaging_qpid/qpid_protocol' : value => $qpid_protocol;
'oslo_messaging_qpid/qpid_tcp_nodelay' : value => $qpid_tcp_nodelay;
'oslo_messaging_qpid/qpid_reconnect' : value => $qpid_reconnect;
'oslo_messaging_qpid/qpid_reconnect_timeout' : value => $qpid_reconnect_timeout;
'oslo_messaging_qpid/qpid_reconnect_limit' : value => $qpid_reconnect_limit;
'oslo_messaging_qpid/qpid_reconnect_interval_min' : value => $qpid_reconnect_interval_min;
'oslo_messaging_qpid/qpid_reconnect_interval_max' : value => $qpid_reconnect_interval_max;
'oslo_messaging_qpid/qpid_reconnect_interval' : value => $qpid_reconnect_interval;
'oslo_messaging_qpid/amqp_durable_queues' : value => $amqp_durable_queues;
}
}

30
spec/classes/heat_init_spec.rb
View File

@ -221,26 +221,26 @@ describe 'heat' do
shared_examples_for 'qpid as rpc backend' do
context("with default parameters") do
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect').with_value(true) }
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect_interval_max').with_value('0') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_heartbeat').with_value('60') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_protocol').with_value('tcp') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect').with_value(true) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true) }
it { is_expected.to contain_heat_config('DEFAULT/rpc_response_timeout').with_value('60') }
it { is_expected.to contain_heat_config('DEFAULT/amqp_durable_queues').with_value(false) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/amqp_durable_queues').with_value(false) }
end
context("with mandatory parameters set") do
it { is_expected.to contain_heat_config('DEFAULT/rpc_backend').with_value('qpid') }
it { is_expected.to contain_heat_config('DEFAULT/qpid_hostname').with_value( params[:qpid_hostname] ) }
it { is_expected.to contain_heat_config('DEFAULT/qpid_port').with_value( params[:qpid_port] ) }
it { is_expected.to contain_heat_config('DEFAULT/qpid_username').with_value( params[:qpid_username]) }
it { is_expected.to contain_heat_config('DEFAULT/qpid_password').with_value(params[:qpid_password]) }
it { is_expected.to contain_heat_config('DEFAULT/qpid_password').with_secret( true ) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_hostname').with_value( params[:qpid_hostname] ) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_port').with_value( params[:qpid_port] ) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_username').with_value( params[:qpid_username]) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]) }
it { is_expected.to contain_heat_config('oslo_messaging_qpid/qpid_password').with_secret( true ) }
end
context("failing if the rpc_backend is not present") do