diff options
| author | Harm Weites <harm@weites.com> | 2015-06-24 19:27:26 +0200 |
|---|---|---|
| committer | Harm Weites <harm@weites.com> | 2015-06-24 20:38:37 +0200 |
| commit | f23a35651e7ccb7aec9bd3e83cd9783ff79b1942 (patch) | |
| tree | 3836efabae9bf160e05e3d2fb000ead027f6d068 /docker/common/heat | |
| parent | b9d8dc63fd3dc1b959ed842e5333d1d680807e8d (diff) | |
| download | kolla-f23a35651e7ccb7aec9bd3e83cd9783ff79b1942.tar.gz kolla-f23a35651e7ccb7aec9bd3e83cd9783ff79b1942.zip | |
Configure Heat service domain
Change-Id: Iefc2dfea4bf4ce2fa9a5d1f013594929d218b9fc
Closes-Bug: #1463970
Diffstat (limited to 'docker/common/heat')
| -rwxr-xr-x | docker/common/heat/heat-base/config-heat.sh | 10 | ||||
| -rwxr-xr-x | docker/common/heat/heat-engine/start.sh | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh index 449fbd998..9275e5645 100755 --- a/docker/common/heat/heat-base/config-heat.sh +++ b/docker/common/heat/heat-base/config-heat.sh @@ -17,7 +17,8 @@ set -e check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \ HEAT_API_CFN_URL_HOST HEAT_API_CFN_SERVICE_PORT \ KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \ - RABBITMQ_SERVICE_HOST MARIADB_SERVICE_HOST + RABBITMQ_SERVICE_HOST MARIADB_SERVICE_HOST \ + HEAT_DOMAIN_PASS fail_unless_db dump_vars @@ -67,3 +68,10 @@ crudini --set /etc/heat/heat.conf DEFAULT heat_metadata_server_url \ http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT} crudini --set /etc/heat/heat.conf DEFAULT heat_waitcondition_server_url \ http://${HEAT_API_CFN_URL_HOST}:${HEAT_API_CFN_SERVICE_PORT}/v1/waitcondition + +crudini --set /etc/heat/heat.conf DEFAULT stack_domain_admin \ + "heat_domain_admin" +crudini --set /etc/heat/heat.conf DEFAULT stack_domain_admin_password \ + "${HEAT_DOMAIN_PASS}" +crudini --set /etc/heat/heat.conf DEFAULT stack_user_domain_name \ + "heat_user_domain" diff --git a/docker/common/heat/heat-engine/start.sh b/docker/common/heat/heat-engine/start.sh index 531b69375..16453a3be 100755 --- a/docker/common/heat/heat-engine/start.sh +++ b/docker/common/heat/heat-engine/start.sh @@ -4,7 +4,7 @@ . /opt/kolla/config-heat.sh check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD \ - INIT_HEAT_DB + INIT_HEAT_DB HEAT_DOMAIN_PASS fail_unless_db if [ "${INIT_HEAT_DB}" == "true" ]; then @@ -15,6 +15,13 @@ GRANT ALL PRIVILEGES ON ${HEAT_DB_NAME}.* TO EOF /usr/bin/heat-manage db_sync + + # If the database needs to be created, assume keystone-setup is allowed to + # run as well. + heat-keystone-setup-domain \ + --stack-user-domain-name heat_user_domain \ + --stack-domain-admin heat_domain_admin \ + --stack-domain-admin-password ${HEAT_DOMAIN_PASS} fi exec /usr/bin/heat-engine |