Browse code
Merge "Fixes for heat keystone registration."
Jenkins authored on 2012/09/08 14:30:46Showing 2 changed files
| ... | ... |
@@ -35,7 +35,7 @@ catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292 |
| 35 | 35 |
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292 |
| 36 | 36 |
catalog.RegionOne.image.name = Image Service |
| 37 | 37 |
|
| 38 |
-catalog.RegionOne.heat.publicURL = http://%SERVICE_HOST%:8000/v1 |
|
| 39 |
-catalog.RegionOne.heat.adminURL = http://%SERVICE_HOST%:8000/v1 |
|
| 40 |
-catalog.RegionOne.heat.internalURL = http://%SERVICE_HOST%:8000/v1 |
|
| 41 |
-catalog.RegionOne.heat.name = Heat Service |
|
| 38 |
+catalog.RegionOne.orchestration.publicURL = http://%SERVICE_HOST%:8000/v1 |
|
| 39 |
+catalog.RegionOne.orchestration.adminURL = http://%SERVICE_HOST%:8000/v1 |
|
| 40 |
+catalog.RegionOne.orchestration.internalURL = http://%SERVICE_HOST%:8000/v1 |
|
| 41 |
+catalog.RegionOne.orchestration.name = Heat Service |
| ... | ... |
@@ -2081,7 +2081,7 @@ if is_service_enabled key; then |
| 2081 | 2081 |
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \ |
| 2082 | 2082 |
SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \ |
| 2083 | 2083 |
S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \ |
| 2084 |
- DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \ |
|
| 2084 |
+ DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_PORT=$HEAT_API_PORT \ |
|
| 2085 | 2085 |
bash -x $FILES/keystone_data.sh |
| 2086 | 2086 |
|
| 2087 | 2087 |
# Set up auth creds now that keystone is bootstrapped |