Browse code

Merge "Revert "Revert "Use unversioned keystone endpoints"""

Jenkins authored on 2016/04/09 00:47:24
Showing 1 changed files
... ...
@@ -619,9 +619,9 @@ function bootstrap_keystone {
619 619
         --bootstrap-role-name admin \
620 620
         --bootstrap-service-name keystone \
621 621
         --bootstrap-region-id "$REGION_NAME" \
622
-        --bootstrap-admin-url "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \
623
-        --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \
624
-        --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION"
622
+        --bootstrap-admin-url "$KEYSTONE_AUTH_URI" \
623
+        --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT" \
624
+        --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT"
625 625
 }
626 626
 
627 627
 # Restore xtrace