Browse code

Preserve swift tenant_id variable when writing into keystone catalog.

Change-Id: Ib01e520f554dbf3f3a07e120e28c95a005172dfc

Gabriel Hurley authored on 2012/02/24 09:54:01
Showing 2 changed files
... ...
@@ -8,6 +8,7 @@ Dean Troyer <dtroyer@gmail.com>
8 8
 Devin Carlen <devin.carlen@gmail.com>
9 9
 Eddie Hebert <edhebert@gmail.com>
10 10
 Eoghan Glynn <eglynn@redhat.com>
11
+Gabriel Hurley <gabriel@strikeawe.com>
11 12
 Jake Dahn <admin@jakedahn.com>
12 13
 James E. Blair <james.blair@rackspace.com>
13 14
 Jason Cannavale <jason.cannavale@rackspace.com>
... ...
@@ -1328,9 +1328,9 @@ if is_service_enabled key; then
1328 1328
 
1329 1329
     # Add swift endpoints to service catalog if swift is enabled
1330 1330
     if is_service_enabled swift; then
1331
-        echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s" >> $KEYSTONE_CATALOG
1331
+        echo "catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG
1332 1332
         echo "catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/" >> $KEYSTONE_CATALOG
1333
-        echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s" >> $KEYSTONE_CATALOG
1333
+        echo "catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_\$(tenant_id)s" >> $KEYSTONE_CATALOG
1334 1334
         echo "catalog.RegionOne.object_store.name = 'Swift Service'" >> $KEYSTONE_CATALOG
1335 1335
     fi
1336 1336