diff options
| author | Steven Dake <stdake@cisco.com> | 2016-03-09 02:17:19 -0500 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-03-09 03:50:03 -0500 |
| commit | 21ecd9925aaee7ae4193d854daa1634bf60a27a5 (patch) | |
| tree | 3e9d20a532f77bb2151f1e5fdccad6446e2e68e7 /docker | |
| parent | 1f3e75feb1f1b7740e0812d8b2169d5ed2e2542b (diff) | |
| download | kolla-21ecd9925aaee7ae4193d854daa1634bf60a27a5.tar.gz kolla-21ecd9925aaee7ae4193d854daa1634bf60a27a5.zip | |
Upgrade Heat
This could possibly use gold plating in how bootstrapping
operates to use shade rather than the shell in the container.
It is unclear why stack create failed prior to this patch, but
that fact hasn't changed. I think the heat domains are not setup
properly in the configuration files, meaning that the domain ID
must be created outside of Heat and registered in the configuration
file. This is covered in Bug #1553565.
Change-Id: I490d4dd68a101f388c0ecb4acab54d5eaa6e314e
Partially-Implements: blueprint kolla-upgrade
Implements: blueprint 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 |