commit 4921d4dbb937b8a9ca26379a33252f0bebcfb53f
author Jamie Lennox <jamielennox@gmail.com> Tue Feb 23 22:51:04 2016 -0600
committer Jamie Lennox <jamielennox@gmail.com> Thu Mar 17 12:39:49 2016 +1100
tree 9920c0b1264991b377ef682d3b49f69efc0d42dd
parent f0f371951f0df7b797556fd6c5f3ceb0fcc9d76c

Use unversioned keystone endpoints

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

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index 9f23e73..802b380 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -634,9 +634,9 @@
         --bootstrap-role-name admin \
         --bootstrap-service-name keystone \
         --bootstrap-region-id "$REGION_NAME" \
-        --bootstrap-admin-url "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION" \
-        --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION" \
-        --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION"
+        --bootstrap-admin-url "$KEYSTONE_AUTH_URI" \
+        --bootstrap-public-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT" \
+        --bootstrap-internal-url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT"
 }
 
 # Restore xtrace