From 155266b94713da74065e5555cd42485f6e8915e7 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Thu, 23 Feb 2012 16:54:01 -0800
Subject: [PATCH] Preserve swift tenant_id variable when writing into keystone
 catalog.

Change-Id: Ib01e520f554dbf3f3a07e120e28c95a005172dfc
---
 AUTHORS  | 1 +
 stack.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5769f4f798..561826cf24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>
 Eddie Hebert <edhebert@gmail.com>
 Eoghan Glynn <eglynn@redhat.com>
+Gabriel Hurley <gabriel@strikeawe.com>
 Jake Dahn <admin@jakedahn.com>
 James E. Blair <james.blair@rackspace.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
diff --git a/stack.sh b/stack.sh
index 4b8208e299..61e735688d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1328,9 +1328,9 @@ if is_service_enabled key; then
 
     # Add swift endpoints to service catalog if swift is enabled
     if is_service_enabled swift; then
-        echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s" >> $KEYSTONE_CATALOG
+        echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG
         echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/" >> $KEYSTONE_CATALOG
-        echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s" >> $KEYSTONE_CATALOG
+        echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG
         echo "catalog.RegionOne.object_store.name = 'Swift Service'" >> $KEYSTONE_CATALOG
     fi