aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-24 05:58:50 +0000
committerGerrit Code Review <review@openstack.org>2015-06-24 05:58:50 +0000
commit2336ba39d49b9a463ce627b1a8dbc3f3f866252d (patch)
tree906119bb28de2535005789b47fbc17a56d50022e /docker/common
parentcfcbb2f4fa903d81ff075622a8d8d0c70302a361 (diff)
parent1962bfb16e70835af83d93155018933dec866f30 (diff)
downloadkolla-2336ba39d49b9a463ce627b1a8dbc3f3f866252d.tar.gz
kolla-2336ba39d49b9a463ce627b1a8dbc3f3f866252d.zip
Merge "Fix Heat container env vars and dependencies"
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/heat/heat-base/config-heat.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/common/heat/heat-base/config-heat.sh b/docker/common/heat/heat-base/config-heat.sh
index 74b2718a4..449fbd998 100755
--- a/docker/common/heat/heat-base/config-heat.sh
+++ b/docker/common/heat/heat-base/config-heat.sh
@@ -15,7 +15,9 @@ set -e
: ${RABBIT_PASSWORD:=guest}
check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \
- KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST
+ HEAT_API_CFN_URL_HOST HEAT_API_CFN_SERVICE_PORT \
+ KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_PUBLIC_SERVICE_PORT \
+ RABBITMQ_SERVICE_HOST MARIADB_SERVICE_HOST
fail_unless_db
dump_vars