openstack/kolla-ansible
Code Issues Proposed changes

Make Heat bootstrapping idempotent

Browse Source 
Change-Id: I155707ec6c1973d2a36606a0c73e57bda58ed037
Closes-Bug: #1569696
This commit is contained in:
Steven Dake 2016-04-12 23:09:26 -07:00
parent 3e1acf005e
commit 11e5b7dfa9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/heat/heat-api/extend_start.sh
View File

@ -6,7 +6,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
heat-manage db_sync heat-manage db_sync
CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}') CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}')
if [[ "heat" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then if [[ "heat_user_domain" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then
openstack domain create heat_user_domain openstack domain create heat_user_domain
openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD} openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD}
openstack role add --domain heat_user_domain --user heat_domain_admin admin openstack role add --domain heat_user_domain --user heat_domain_admin admin