From 0de6ce0c4f60f860675ebb32e0dc7860a261d017 Mon Sep 17 00:00:00 2001
From: Chris Ricker <chricker@cisco.com>
Date: Mon, 23 Sep 2013 06:26:31 -0700
Subject: [PATCH] Configurable admin for Swift proxy authtoken class

The admin user and admin tenant are being passed to the
openstack::swift::proxy class but then are hardcoded in the call of the
proxy::authtoken class. This change passes the configured values to the
authtoken class also.

Change-Id: I9a0e762a9b4f2ddbe707ff36f89773c72cacb641
---
 manifests/swift/proxy.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/swift/proxy.pp b/manifests/swift/proxy.pp
index 34cf188..b33bcf3 100644
--- a/manifests/swift/proxy.pp
+++ b/manifests/swift/proxy.pp
@@ -81,8 +81,8 @@ class openstack::swift::proxy (
     operator_roles => ['admin', 'SwiftOperator'],
   }
   class { '::swift::proxy::authtoken':
-    admin_user        => 'swift',
-    admin_tenant_name => 'services',
+    admin_user        => $swift_admin_user,
+    admin_tenant_name => $swift_admin_tenant,
     admin_password    => $swift_user_password,
     auth_host         => $real_keystone_host,
   }