Browse code

Revert "Revert "Use unversioned keystone endpoints""

This reverts commit da1ca6e07c0d54d0ec5b94ebd78da81c6a46e780.

Depends-on: Id2c7e09611c1f8b06e6d272589b4ea3435b8de86
Change-Id: I1b2a65179b5863d8bcbc5dd02b615f4e6e564213

Armando Migliaccio authored on 2016/04/07 09:12:51
Showing 1 changed files
... ...
@@ -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