diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2015-06-09 18:55:44 -0400 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2015-06-19 17:33:32 -0400 |
| commit | 1962bfb16e70835af83d93155018933dec866f30 (patch) | |
| tree | 49527671223e96740fe1b9ac60adfc9d7a8521aa /docker/common | |
| parent | b87f16fac59236c1c1047f75457fa8ea8cab976c (diff) | |
| download | kolla-1962bfb16e70835af83d93155018933dec866f30.tar.gz kolla-1962bfb16e70835af83d93155018933dec866f30.zip | |
Fix Heat container env vars and dependencies
This commit adds a few dependencies (that are actually packaging errors)
present in all of the containers, as well as specifically in
heat-engine. Some of the environment variables were not set correctly in
the heat-api-cfn container. The environment variables have also been
correctly added to the genenv script.
Also removed duplicated compose file data already present in
heat-api-engine.
Closes-Bug: #1461872
Change-Id: I9631d1bc6ea42425272570a9dda8cbf5edcef4f3
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/heat/heat-base/config-heat.sh | 4 |
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 |