commit be11ae7abc740f8feda47dea38e8dfbfaccdf652
author Jenkins <jenkins@review.openstack.org> Tue Apr 05 15:35:32 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 05 15:35:32 2016 +0000
tree ba2201f2d48b05fa380a73b728a2f3345f8ff8b4
parent a4740fb228822046b002ba9b772de75e087afd40
parent 260583e25eabffd70942c7d97df09a5dd2ed55d6

Merge "Switch over swift to using $(project_id) in service catalog"

lib/swift

diff --git a/lib/swift b/lib/swift
index 8c5aa5e..b2fe755 100644
--- a/lib/swift
+++ b/lib/swift
@@ -631,9 +631,9 @@
     get_or_create_endpoint \
         "object-store" \
         "$REGION_NAME" \
-        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" \
+        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(project_id)s" \
         "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT" \
-        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s"
+        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(project_id)s"
 
     local swift_tenant_test1
     swift_tenant_test1=$(get_or_create_project swifttenanttest1 default)