Insert the unversioned keystone URLs into the service catalog. Services
should be able to determine the correct URL for their work from this.
Depends-On: I931f0c558aafc8dfaa5519744c6e4e7fcffc3205
Change-Id: I6171f782a1dd397720a9b2a3393b30ae5aca0cc2
| ... | ... |
@@ -634,9 +634,9 @@ function bootstrap_keystone {
|
| 634 | 634 |
--bootstrap-role-name admin \ |
| 635 | 635 |
--bootstrap-service-name keystone \ |
| 636 | 636 |
--bootstrap-region-id "$REGION_NAME" \ |
| 637 |
- --bootstrap-admin-url "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \ |
|
| 638 |
- --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \ |
|
| 639 |
- --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" |
|
| 637 |
+ --bootstrap-admin-url "$KEYSTONE_AUTH_URI" \ |
|
| 638 |
+ --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT" \ |
|
| 639 |
+ --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT" |
|
| 640 | 640 |
} |
| 641 | 641 |
|
| 642 | 642 |
# Restore xtrace |