From 91ca8d4b00c632bcf7a2a9903aa4cf584fee27e9 Mon Sep 17 00:00:00 2001 From: Martin André Date: Mon, 1 Dec 2014 14:50:58 +0900 Subject: Cleanup required variables checks for all containers This allows Kubernetes to reschedule containers in case a required variable is missing, for example when the Kubernetes pod is started before the service. The checks were cleaned using the following method: * remove duplicates * remove check for variables that get a default value in the same file * check for all variables used in the file * check for required services when it is obvious. Change-Id: Ib7e0530c410c61f828d36efe8925a20dc9781eab --- docker/heat/heat-base/config-heat.sh | 5 ++++- docker/heat/heat-engine/start.sh | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'docker/heat') 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 <