Conflicts:
files/keystone_data.sh
Change-Id: I82a45ef1e653a7de9ab3b48e7675f1440172b3f9
... | ... |
@@ -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> |
... | ... |
@@ -34,7 +34,7 @@ $BIN_DIR/keystone-manage $* service add swift object-store "Swift Service" |
34 | 34 |
|
35 | 35 |
#endpointTemplates |
36 | 36 |
$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 |
37 |
-$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 |
|
37 |
+$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 |
|
38 | 38 |
$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 |
39 | 39 |
$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 |
40 | 40 |
|