diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-05 10:29:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-05 10:29:47 +0000 |
| commit | 524a821577d568a7a19983a7b6adc36e78fb9e4d (patch) | |
| tree | 24ecbef8b645311e500763b3e60ec31f71a71d93 /docker | |
| parent | 1666ee5b768fee7075e59c2a1409a4bee43e8b5b (diff) | |
| parent | 5e946cac490077011709c7587dc5e0b06927464f (diff) | |
| download | kolla-524a821577d568a7a19983a7b6adc36e78fb9e4d.tar.gz kolla-524a821577d568a7a19983a7b6adc36e78fb9e4d.zip | |
Merge "Checks for heat_user_domain explicitly"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-api/extend_start.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index 8106cc51a..ba5f1450d 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -4,13 +4,15 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then heat-manage db_sync - CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}') - if [[ "heat_user_domain" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then + EXISTING_DOMAINS=$(openstack domain list -f value -c Name) + + if ! echo "$EXISTING_DOMAINS" | grep '^heat_user_domain$' &>/dev/null; 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-domain heat_user_domain --user heat_domain_admin admin fi + exit 0 fi |