openstack
/
puppet-glance
Code Issues Proposed changes

Change section name for AMQP qpid parameters 

According to docs for liberty and kilo [1,2] should be
section 'oslo_messaging_qpid' instead of 'DEFAULT'.

[1] http://docs.openstack.org/liberty/config-reference/content/configuring-rpc.html
[2] http://docs.openstack.org/kilo/config-reference/content/configuring-rpc.html

Change-Id: I1160721f36768c33acb99407c107d23696cabe0f
This commit is contained in:
Denis Egorenko 2015-10-21 14:14:16 +03:00
parent 604556667f
commit 62959150b1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/notify/qpid.pp
View File

@ -32,12 +32,12 @@ class glance::notify::qpid(
) inherits glance::api { ) inherits glance::api {
glance_api_config { glance_api_config {
'DEFAULT/notifier_driver': value => 'qpid'; 'DEFAULT/notifier_driver': value => 'qpid';
'DEFAULT/qpid_hostname': value => $qpid_hostname; 'oslo_messaging_qpid/qpid_hostname': value => $qpid_hostname;
'DEFAULT/qpid_port': value => $qpid_port; 'oslo_messaging_qpid/qpid_port': value => $qpid_port;
'DEFAULT/qpid_protocol': value => $qpid_protocol; 'oslo_messaging_qpid/qpid_protocol': value => $qpid_protocol;
'DEFAULT/qpid_username': value => $qpid_username; 'oslo_messaging_qpid/qpid_username': value => $qpid_username;
'DEFAULT/qpid_password': value => $qpid_password, secret => true; 'oslo_messaging_qpid/qpid_password': value => $qpid_password, secret => true;
} }
} }

28
spec/classes/glance_notify_qpid_spec.rb
View File

@ -16,12 +16,12 @@ describe 'glance::notify::qpid' do
end end
it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('qpid') } it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('qpid') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_username').with_value('guest') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_password').with_value('pass') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value('pass') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_password').with_value(params[:qpid_password]).with_secret(true) } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]).with_secret(true) }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_hostname').with_value('localhost') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_port').with_value('5672') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5672') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_protocol').with_value('tcp') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
end end
describe 'when passing params' do describe 'when passing params' do
@ -33,10 +33,10 @@ describe 'glance::notify::qpid' do
:qpid_port => '5673' :qpid_port => '5673'
} }
end end
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_username').with_value('guest2') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest2') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_hostname').with_value('localhost2') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost2') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_port').with_value('5673') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5673') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_protocol').with_value('tcp') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
end end
describe 'when configuring with ssl' do describe 'when configuring with ssl' do
@ -49,9 +49,9 @@ describe 'glance::notify::qpid' do
:qpid_protocol => 'ssl' :qpid_protocol => 'ssl'
} }
end end
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_username').with_value('guest3') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest3') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_hostname').with_value('localhost3') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost3') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_port').with_value('5671') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5671') }
it { is_expected.to contain_glance_api_config('DEFAULT/qpid_protocol').with_value('ssl') } it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('ssl') }
end end
end end