aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-06 19:08:46 +0000
committerGerrit Code Review <review@openstack.org>2015-02-06 19:08:46 +0000
commit26b564dd06890862e268ea72b987bcb5ebf4bdb2 (patch)
tree726b9e932f6e5e711583bf9556100d4a5ad15e7d /docker/heat
parente91aafc75a656f108f97d6adb69fe132923b9119 (diff)
parent91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 (diff)
downloadkolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.tar.gz
kolla-26b564dd06890862e268ea72b987bcb5ebf4bdb2.zip
Merge "Cleanup required variables checks for all containers"
Diffstat (limited to 'docker/heat')
-rwxr-xr-xdocker/heat/heat-base/config-heat.sh5
-rwxr-xr-xdocker/heat/heat-engine/start.sh3
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh
index c2837325c..3dcb1435a 100755
--- a/docker/heat/heat-base/config-heat.sh
+++ b/docker/heat/heat-base/config-heat.sh
@@ -13,7 +13,10 @@ set -e
: ${RABBIT_USER:=guest}
: ${RABBIT_PASSWORD:=guest}
-check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD
+check_required_vars HEAT_DB_PASSWORD HEAT_KEYSTONE_PASSWORD \
+ KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST
+
+check_for_db
dump_vars
cat > /openrc <<EOF
diff --git a/docker/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh
index 0ab9e4800..e9d3f9e41 100755
--- a/docker/heat/heat-engine/start.sh
+++ b/docker/heat/heat-engine/start.sh
@@ -3,8 +3,7 @@
. /opt/kolla/kolla-common.sh
. /opt/kolla/config-heat.sh
-check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \
- HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD
+check_required_vars HEAT_DB_NAME HEAT_DB_USER HEAT_DB_PASSWORD
check_for_db
mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF