diff options
| author | Fabian Bermel <fabian.bermel@noris.de> | 2020-03-09 14:42:34 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-10-14 09:45:00 +0000 |
| commit | bb62d2559fda8431c6e9721ae6ca6b6d0755921c (patch) | |
| tree | 7aabb1a0607e84215e55178ea70ee29a6b5123d1 | |
| parent | c6835b12a6f1e8f715aa5c69383a8d1836551496 (diff) | |
| download | kolla-bb62d2559fda8431c6e9721ae6ca6b6d0755921c.tar.gz kolla-bb62d2559fda8431c6e9721ae6ca6b6d0755921c.zip | |
Checks for heat_user_domain explicitly
The script should check for heat_user_domain explicitly instead of matching on "heat"
Closes-Bug: #1839824
Change-Id: Iac83444487d2aa96a0f90086029f43922d1e7856
(cherry picked from commit 5e946cac490077011709c7587dc5e0b06927464f)
| -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 be87c0923..ddf4f81f4 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -4,12 +4,14 @@ # 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 |