Browse code
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
Sean Dague authored on 2016/04/04 22:11:25Showing 1 changed files
| ... | ... |
@@ -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) |