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/zaqar/start.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docker/zaqar') diff --git a/docker/zaqar/start.sh b/docker/zaqar/start.sh index 7ed89a40a..6c68fccf2 100755 --- a/docker/zaqar/start.sh +++ b/docker/zaqar/start.sh @@ -5,16 +5,12 @@ set -e . /opt/kolla/kolla-common.sh : ${ADMIN_TENANT_NAME:=admin} - -: ${ZAQAR_DB_NAME:=zaqar} -: ${ZAQAR_DB_USER:=zaqar} - : ${ZAQAR_KEYSTONE_USER:=zaqar} - : ${KEYSTONE_AUTH_PROTOCOL:=http} -check_required_vars ZAQAR_DB_PASSWORD ZAQAR_KEYSTONE_PASSWORD \ - KEYSTONE_ADMIN_TOKEN +check_required_vars ZAQAR_KEYSTONE_PASSWORD ZAQAR_SERVER_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_TOKEN \ + PUBLIC_IP dump_vars #check_for_mongodb -- cgit v1.2.3