From 74b15ec273fb458de8410abb65e60ff65da6820b Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 14 Oct 2012 00:23:09 -0700
Subject: [PATCH] fix backends

---
 manifests/backend/swift.pp   | 8 ++++----
 manifests/notify/qpid.pp     | 5 +++--
 manifests/notify/rabbitmq.pp | 4 ++--
 manifests/registry.pp        | 7 +++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp
index 15734912..c4e0d13d 100644
--- a/manifests/backend/swift.pp
+++ b/manifests/backend/swift.pp
@@ -21,10 +21,10 @@ class glance::backend::swift(
 
   glance_api_config {
     'DEFAULT/default_store': value => 'swift';
-    'DEFAULT/swift_store_user':        value => $swift_store_user,
-    'DEFAULT/swift_store_key':         value => $swift_store_key,
-    'DEFAULT/swift_store_auth_address' value => $swift_store_auth_address,
-    'DEFAULT/swift_store_container':   value => $swift_store_container,
+    'DEFAULT/swift_store_user':         value => $swift_store_user;
+    'DEFAULT/swift_store_key':          value => $swift_store_key;
+    'DEFAULT/swift_store_auth_address': value => $swift_store_auth_address;
+    'DEFAULT/swift_store_container':    value => $swift_store_container;
     'DEFAULT/swift_store_create_container_on_put':
       value => $swift_store_create_container_on_put;
   }
diff --git a/manifests/notify/qpid.pp b/manifests/notify/qpid.pp
index ef199cdb..f5a5d3ca 100644
--- a/manifests/notify/qpid.pp
+++ b/manifests/notify/qpid.pp
@@ -3,8 +3,9 @@
 #
 class glance::notify::qpid(
   $qpid_password,
-  $qpid_usernane => 'guest',
-  $qpid_host     => 'localhost'
+  $qpid_username = 'guest',
+  $qpid_host     = 'localhost',
+  $qpid_port     = '5672'
 ) inherits glance::api {
 
   glance_api_config {
diff --git a/manifests/notify/rabbitmq.pp b/manifests/notify/rabbitmq.pp
index f9b3a1ac..67643b11 100644
--- a/manifests/notify/rabbitmq.pp
+++ b/manifests/notify/rabbitmq.pp
@@ -3,8 +3,8 @@
 #
 class glance::notify::rabbitmq(
   $rabbit_password,
-  $rabbitmq_userid => 'guest',
-  $rabbit_host     => 'localhost'
+  $rabbit_userid   = 'guest',
+  $rabbit_host     = 'localhost'
 ) inherits glance::api {
 
   glance_api_config {
diff --git a/manifests/registry.pp b/manifests/registry.pp
index 48517ba6..1a6fad0b 100644
--- a/manifests/registry.pp
+++ b/manifests/registry.pp
@@ -60,10 +60,9 @@ class glance::registry(
 
   # auth config
   glance_registry_config {
-    'keystone_authtoken/auth_host':         value => $auth_host;
-    'keystone_authtoken/auth_port':         value => $auth_port;
-    'keystone_authtoken/protocol':          value => $protocol;
-    'keystone_authtoken/auth_uri':          value => $auth_uri;
+    'keystone_authtoken/auth_host':     value => $auth_host;
+    'keystone_authtoken/auth_port':     value => $auth_port;
+    'keystone_authtoken/auth_protocol': value => $auth_protocol;
   }
 
   # keystone config