Browse code
Fix the glance endpoint template URL. Fixes bug 909075.
Conflicts:
files/keystone_data.sh
Change-Id: I82a45ef1e653a7de9ab3b48e7675f1440172b3f9
Kiall Mac Innes authored on 2011/12/31 03:53:26Showing 2 changed files
| ... | ... |
@@ -11,6 +11,7 @@ Jason Cannavale <jason.cannavale@rackspace.com> |
| 11 | 11 |
Jay Pipes <jaypipes@gmail.com> |
| 12 | 12 |
Jesse Andrews <anotherjesse@gmail.com> |
| 13 | 13 |
Justin Shepherd <galstrom21@gmail.com> |
| 14 |
+Kiall Mac Innes <kiall@managedit.ie> |
|
| 14 | 15 |
Scott Moser <smoser@ubuntu.com> |
| 15 | 16 |
Todd Willey <xtoddx@gmail.com> |
| 16 | 17 |
Tres Henry <tres@treshenry.net> |
| ... | ... |
@@ -38,7 +38,7 @@ fi |
| 38 | 38 |
#endpointTemplates |
| 39 | 39 |
$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 |
| 40 | 40 |
$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 |
| 41 |
-$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 |
|
| 41 |
+$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 |
|
| 42 | 42 |
$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 |
| 43 | 43 |
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then |
| 44 | 44 |
$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 |