openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "Change section name for AMQP qpid parameters"

This commit is contained in:
Jenkins 2015-10-21 16:26:33 +00:00 committed by Gerrit Code Review
parent e6bb23600d b7dc1cb43b
commit f25117fe79
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/init.pp
View File

@ -349,20 +349,20 @@ class cinder (
}
cinder_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_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/qpid_heartbeat': value => $qpid_heartbeat;
'DEFAULT/qpid_protocol': value => $qpid_protocol;
'DEFAULT/qpid_tcp_nodelay': value => $qpid_tcp_nodelay;
'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_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/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/amqp_durable_queues': value => $amqp_durable_queues;
}
if is_array($qpid_sasl_mechanisms) {

26
spec/classes/cinder_spec.rb
View File

@ -92,19 +92,19 @@ describe 'cinder' do
end
it { is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with_value('qpid') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_hostname').with_value('localhost') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_port').with_value('5672') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_username').with_value('guest') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_password').with_value('guest').with_secret(true) }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect').with_value(true) }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect_interval_max').with_value('0') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_heartbeat').with_value('60') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_protocol').with_value('tcp') }
it { is_expected.to contain_cinder_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_port').with_value('5672') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_username').with_value('guest') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_password').with_value('guest').with_secret(true) }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect').with_value(true) }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
it { is_expected.to contain_cinder_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true) }
end
describe 'with qpid rpc and no qpid_sasl_mechanisms' do