commit 6b6d48eaffe9be596b5fec583f730a9d412c9262
author Jenkins <jenkins@review.openstack.org> Thu Apr 07 00:40:31 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 07 00:40:31 2016 +0000
tree 7928a675942530ae5c31992546c68cbff318a338
parent 2bf60959256f3da0729ba8624cb8926f4831ed89
parent d3d21394db4a958bed55d856f780c127324a71b8

Merge "Fix create_flavors on subnodes"

lib/keystone

diff --git a/lib/keystone b/lib/keystone
index f058114..d830924 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -619,9 +619,9 @@
         --bootstrap-role-name admin \
         --bootstrap-service-name keystone \
         --bootstrap-region-id "$REGION_NAME" \
-        --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"
+        --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"
 }
 
 # Restore xtrace

lib/nova

diff --git a/lib/nova b/lib/nova
index 77bc3c8..ad72fc3 100644
--- a/lib/nova
+++ b/lib/nova
@@ -429,9 +429,9 @@
         get_or_create_endpoint \
             "compute" \
             "$REGION_NAME" \
-            "$nova_api_url/v2.1/\$(project_id)s" \
-            "$nova_api_url/v2.1/\$(project_id)s" \
-            "$nova_api_url/v2.1/\$(project_id)s"
+            "$nova_api_url/v2.1" \
+            "$nova_api_url/v2.1" \
+            "$nova_api_url/v2.1"
     fi
 
     if is_service_enabled n-api; then