From 5557c224f37c22b058c951d7494448981cb484a2 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 13 Nov 2013 14:02:14 +0100
Subject: [PATCH] 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
---
 manifests/notify/qpid.pp                | 4 ++--
 spec/classes/glance_notify_qpid_spec.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/notify/qpid.pp b/manifests/notify/qpid.pp
index fbbbccfb..71f064bd 100644
--- a/manifests/notify/qpid.pp
+++ b/manifests/notify/qpid.pp
@@ -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;
diff --git a/spec/classes/glance_notify_qpid_spec.rb b/spec/classes/glance_notify_qpid_spec.rb
index 98b07557..ce1f23be 100644
--- a/spec/classes/glance_notify_qpid_spec.rb
+++ b/spec/classes/glance_notify_qpid_spec.rb
@@ -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