commit 34694f156874e10199e29d4d92f35626b68d88d2
author Kiall Mac Innes <kiall@managedit.ie> Fri Dec 30 18:53:26 2011 +0000
committer Kiall Mac Innes <kiall@managedit.ie> Fri Dec 30 19:04:33 2011 +0000
tree 9cf72596ce434ebbf7d658599ee9dca105fa05e6
parent b8489cd31e7728040921923bf9d8f85cda91070e

Fix the glance endpoint template URL. Fixes bug 909075.

Conflicts:

	files/keystone_data.sh

Change-Id: I82a45ef1e653a7de9ab3b48e7675f1440172b3f9

files/keystone_data.sh

diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index e7e67da..a25ba20 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -38,7 +38,7 @@
 #endpointTemplates
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%SERVICE_HOST%:8774/v1.1/%tenant_id% http://%SERVICE_HOST%:8774/v1.1/%tenant_id%  http://%SERVICE_HOST%:8774/v1.1/%tenant_id% 1 1
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne ec2 http://%SERVICE_HOST%:8773/services/Cloud http://%SERVICE_HOST%:8773/services/Admin http://%SERVICE_HOST%:8773/services/Cloud 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%SERVICE_HOST%:9292/v1.1/%tenant_id% http://%SERVICE_HOST%:9292/v1.1/%tenant_id% http://%SERVICE_HOST%:9292/v1.1/%tenant_id% 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%SERVICE_HOST%:9292/v1 http://%SERVICE_HOST%:9292/v1 http://%SERVICE_HOST%:9292/v1 1 1
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%SERVICE_HOST%:5000/v2.0 http://%SERVICE_HOST%:35357/v2.0 http://%SERVICE_HOST%:5000/v2.0 1 1
 if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
     $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% http://%SERVICE_HOST%:8080/ http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% 1 1