From 11e5b7dfa92afb72758e562115e60ee2cd9fdca5 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 12 Apr 2016 23:09:26 -0700
Subject: [PATCH] Make Heat bootstrapping idempotent
Change-Id: I155707ec6c1973d2a36606a0c73e57bda58ed037
Closes-Bug: #1569696
---
docker/heat/heat-api/extend_start.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh
index 5c310f6c06..5702922e86 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