Move heat keystone setup into lib/heat
Move the heat setup which currently happens in files/keystone_data.sh
to lib/heat, where we have create_heat_accounts.
Move the user, role, service and endpoint creation as that is consistent
with what other services, e.g lib/nova are doing.
Change-Id: Iaa2c822cad581d6b2b4f22f8863daf81e25f8485
diff --git a/stack.sh b/stack.sh
index ccd567e..ec8de2d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -934,8 +934,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 HEAT_API_CFN_PORT=$HEAT_API_CFN_PORT \
- HEAT_API_PORT=$HEAT_API_PORT \
+ DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES \
bash -x $FILES/keystone_data.sh
# Set up auth creds now that keystone is bootstrapped