Preserve swift tenant_id variable when writing into keystone catalog.

gabrielhurley · gabrielhurley · commit 155266b94713 · 2012-02-23T17:01:40.000-08:00
Change-Id: Ib01e520f554dbf3f3a07e120e28c95a005172dfc
diff --git 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
@@ -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
 

-Original file line number
+Diff line change
 Devin Carlen <[email protected]>
 Eddie Hebert <[email protected]>
 Eoghan Glynn <[email protected]>
 +Gabriel Hurley <[email protected]>
 Jake Dahn <[email protected]>
 James E. Blair <[email protected]>
 Jason Cannavale <[email protected]>