From 260583e25eabffd70942c7d97df09a5dd2ed55d6 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 4 Apr 2016 09:11:25 -0400 Subject: [PATCH] Switch over swift to using $(project_id) in service catalog This removes one more place where we use tenant_id in our code. Change-Id: I628fb7c1dd6f22ce499fc5cbe97b79458cce966f --- lib/swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/swift b/lib/swift index 8c5aa5e4e8..b2fe755cef 100644 --- a/lib/swift +++ b/lib/swift @@ -631,9 +631,9 @@ function create_swift_accounts { 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)