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
diff --git a/stack.sh b/stack.sh
index 3e3d8cf..fd6e9ee 100755
--- a/stack.sh
+++ b/stack.sh
@@ -2147,7 +2147,7 @@
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=$SERVICE_TENANT_NAME SERVICE_PASSWORD=$SERVICE_PASSWORD \
SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT SERVICE_HOST=$SERVICE_HOST \
S3_SERVICE_PORT=$S3_SERVICE_PORT KEYSTONE_CATALOG_BACKEND=$KEYSTONE_CATALOG_BACKEND \
- DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \
+ DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES HEAT_API_PORT=$HEAT_API_PORT \
bash -x $FILES/keystone_data.sh
# Set up auth creds now that keystone is bootstrapped