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/glance/glance-base/config-glance.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index a6380e5c8..2a6e54caa 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -11,7 +11,9 @@ set -e : ${KEYSTONE_AUTH_PROTOCOL:=http} : ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR} -check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD +check_for_db +check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD \ + KEYSTONE_PUBLIC_SERVICE_HOST dump_vars cat > /openrc <