Fix the glance endpoint template URL. Fixes bug 909075.

kiall · kiall · commit fe1ea878ee08 · 2011-12-27T17:20:31.000Z
Conflicts:

	files/keystone_data.sh

Change-Id: I82a45ef1e653a7de9ab3b48e7675f1440172b3f9
diff --git a/AUTHORS b/AUTHORS
@@ -11,6 +11,7 @@ Jason Cannavale <jason.cannavale@rackspace.com>
 Jay Pipes <jaypipes@gmail.com>
 Jesse Andrews <anotherjesse@gmail.com>
 Justin Shepherd <galstrom21@gmail.com>
+Kiall Mac Innes <kiall@managedit.ie>
 Scott Moser <smoser@ubuntu.com>
 Todd Willey <xtoddx@gmail.com>
 Tres Henry <tres@treshenry.net>
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
@@ -34,7 +34,7 @@ $BIN_DIR/keystone-manage $* service add swift object-store "Swift Service"
 
 #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 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
 $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
 

-Original file line number
+Diff line change
 Jay Pipes <[email protected]>
 Jesse Andrews <[email protected]>
 Justin Shepherd <[email protected]>
 +Kiall Mac Innes <[email protected]>
 Scott Moser <[email protected]>
 Todd Willey <[email protected]>
 Tres Henry <[email protected]>