openstack/puppet-glance
Code Issues Proposed changes

Add parameter qpid_protocol to notify::qpid so ssl can be enabled.

Browse Source 
Bug: #1251050
Change-Id: Ibc3b5e19b2543ff33366f305e7b9cef61dddf2f1
This commit is contained in:
Rob Crittenden
2013-11-14 15:03:20 -05:00
parent cabf6d6b6c
commit 3c0558188a
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/notify/qpid.pp
View File

@@ -5,13 +5,15 @@ class glance::notify::qpid(
$qpid_password,
$qpid_username = 'guest',
$qpid_host = 'localhost',
$qpid_port = '5672'
$qpid_port = '5672',
$qpid_protocol = 'tcp'
) inherits glance::api {
glance_api_config {
'DEFAULT/notifier_strategy': value => 'qpid';
'DEFAULT/qpid_host': value => $qpid_host;
'DEFAULT/qpid_port': value => $qpid_port;
'DEFAULT/qpid_protocol': value => $qpid_protocol;
'DEFAULT/qpid_username': value => $qpid_username;
'DEFAULT/qpid_password': value => $qpid_password;
}

18
spec/classes/glance_notify_qpid_spec.rb
View File

@@ -18,6 +18,7 @@ describe 'glance::notify::qpid' do
it { should contain_glance_api_config('DEFAULT/qpid_password').with_value('pass') }
it { should contain_glance_api_config('DEFAULT/qpid_host').with_value('localhost') }
it { should contain_glance_api_config('DEFAULT/qpid_port').with_value('5672') }
it { should contain_glance_api_config('DEFAULT/qpid_protocol').with_value('tcp') }
describe 'when passing params' do
let :params do
@@ -30,6 +31,23 @@ describe 'glance::notify::qpid' do
it { should contain_glance_api_config('DEFAULT/qpid_username').with_value('guest2') }
it { should contain_glance_api_config('DEFAULT/qpid_host').with_value('localhost2') }
it { should contain_glance_api_config('DEFAULT/qpid_port').with_value('5673') }
it { should contain_glance_api_config('DEFAULT/qpid_protocol').with_value('tcp') }
end
end
describe 'configuring with ssl' do
let :params do
{
:qpid_password => 'pass',
:qpid_usernane => 'guest2',
:qpid_host => 'localhost2',
:qpid_port => '5671',
:qpid_protocol => 'ssl'
}
it { should contain_glance_api_config('DEFAULT/qpid_username').with_value('guest2') }
it { should contain_glance_api_config('DEFAULT/qpid_host').with_value('localhost2') }
it { should contain_glance_api_config('DEFAULT/qpid_port').with_value('5671') }
it { should contain_glance_api_config('DEFAULT/qpid_protocol').with_value('ssl') }
end
end
end