openstack
/
puppet-glance
Code Issues Proposed changes

Replace qpid_host with qpid_hostname 

This patch replaces `qpid_host` with `qpid_hostname` in both the
qpid manifest and the spec file class. `qpid_host` has been shipped
as the parameter to specify qpid's hostname, although the correct one is
`qpid_hostname`.

Closes-bug 1242715

Change-Id: I92b8da5a204180316f8117634a45154023551abd
This commit is contained in:
Flavio Percoco 2013-11-13 14:02:14 +01:00
parent 3c0558188a
commit 5557c224f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/notify/qpid.pp
View File

@ -4,14 +4,14 @@
class glance::notify::qpid(
$qpid_password,
$qpid_username = 'guest',
$qpid_host = 'localhost',
$qpid_hostname = 'localhost',
$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_hostname': value => $qpid_hostname;
'DEFAULT/qpid_port': value => $qpid_port;
'DEFAULT/qpid_protocol': value => $qpid_protocol;
'DEFAULT/qpid_username': value => $qpid_username;

6
spec/classes/glance_notify_qpid_spec.rb
View File

@ -16,7 +16,7 @@ describe 'glance::notify::qpid' do
it { should contain_glance_api_config('DEFAULT/notifier_strategy').with_value('qpid') }
it { should contain_glance_api_config('DEFAULT/qpid_username').with_value('guest') }
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_hostname').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') }
@ -25,11 +25,11 @@ describe 'glance::notify::qpid' do
{
:qpid_password => 'pass',
:qpid_usernane => 'guest2',
:qpid_host => 'localhost2',
:qpid_hostname => 'localhost2',
:qpid_port => '5673'
}
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_hostname').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