diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 11:46:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 11:46:57 +0000 |
| commit | 90793fee226c0afa0e1d417cbe16c01b957746c3 (patch) | |
| tree | 0f5ee2b9a002656caa8d4320891292a2aa5c1cab /docker | |
| parent | 13a60622601a3fc8535c0ee8c10a1da2d0ea928b (diff) | |
| parent | 21ecd9925aaee7ae4193d854daa1634bf60a27a5 (diff) | |
| download | kolla-90793fee226c0afa0e1d417cbe16c01b957746c3.tar.gz kolla-90793fee226c0afa0e1d417cbe16c01b957746c3.zip | |
Merge "Upgrade Heat"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-api/extend_start.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index ca4f83da5..9c1e5ba3b 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -4,10 +4,14 @@ # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then heat-manage db_sync - openstack domain create heat - openstack user create --domain heat heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD} - openstack role add --domain heat --user heat_domain_admin admin - openstack role create heat_stack_owner - openstack role create heat_stack_user + CURRENT_HEAT_DOMAIN_NAME=$(openstack domain list | grep heat | awk '{print $4}') + + if [[ "heat" != "$CURRENT_HEAT_DOMAIN_NAME" ]]; then + openstack domain create heat + openstack user create --domain heat heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD} + openstack role add --domain heat --user heat_domain_admin admin + openstack role create heat_stack_owner + openstack role create heat_stack_user + fi exit 0 fi |