1. devstack
  2. Commit 694a42a02c36816db524b548e97874eb4b448e51
Browse code

Fixes for heat keystone registration.

- Pass HEAT_API_PORT into keystone_data.sh from stack.sh
- Use the correct service type in default_catalog.templates key

Change-Id: I17dad3a0255dc0307b052927a8ad1971cb9142a8

Steve Baker authored on 2012/09/05 05:19:39
Showing 2 changed files
files/default_catalog.templates
History View file @ 694a42a
... ... 
@@ -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
stack.sh
History View file @ 694a42a
... ... 
@@ -2147,7 +2147,7 @@ if is_service_enabled key; then
2147 2147 
     ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \
2148 2148 
     SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \
2149 2149 
     S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \
2150 
-    DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \
2150 
+    DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_PORT=$HEAT_API_PORT \
2151 2151 
         bash -x $FILES/keystone_data.sh
2152 2152
2153 2153 
     # Set up auth creds now that keystone is bootstrapped