1. devstack
  2. Commit be11ae7abc740f8feda47dea38e8dfbfaccdf652
Browse code

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

Jenkins authored on 2016/04/06 00:35:32
Showing 1 changed files
lib/swift
History View file @ be11ae7
... ... 
@@ -631,9 +631,9 @@ function create_swift_accounts {
631 631 
     get_or_create_endpoint \
632 632 
         "object-store" \
633 633 
         "$REGION_NAME" \
634 
-        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s" \
634 
+        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(project_id)s" \
635 635 
         "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT" \
636 
-        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(tenant_id)s"
636 
+        "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_\$(project_id)s"
637 637
638 638 
     local swift_tenant_test1
639 639 
     swift_tenant_test1=$(get_or_create_project swifttenanttest1 default)