diff options
| author | Steven Dake <stdake@cisco.com> | 2016-04-12 23:09:26 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-04-12 23:10:13 -0700 |
| commit | 11e5b7dfa92afb72758e562115e60ee2cd9fdca5 (patch) | |
| tree | 9b47e57b92d32554f1aecc3b774faa51f1bbee1c /docker | |
| parent | 3e1acf005e0c396ef9fc4efd0d3866ebd703b2c3 (diff) | |
| download | kolla-11e5b7dfa92afb72758e562115e60ee2cd9fdca5.tar.gz kolla-11e5b7dfa92afb72758e562115e60ee2cd9fdca5.zip | |
Make Heat bootstrapping idempotent
Change-Id: I155707ec6c1973d2a36606a0c73e57bda58ed037
Closes-Bug: #1569696
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-api/extend_start.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index 5c310f6c0..5702922e8 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -6,7 +6,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then heat-manage db_sync 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 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 |