From 21f28309e7a15f25e1763611d18330145e0ff0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 1 Dec 2014 14:50:58 +0900 Subject: [PATCH] Check for all required variables in keystone start.sh This allows Kubernetes to reschedule the container in case a required variable is missing, for example when the Kubernetes pod is started before the service. Additionally, define the KEYSTONE_ADMIN_SERVICE_HOST and KEYSTONE_PUBLIC_SERVICE_HOST variables to their common version if not already set to allow usage outside of Kubernetes with docker link feature. Change-Id: Ie0966c18076a770e4031bbf5f777dd1be0ba20bc Closes-Bug: 1398632 --- docker/keystone/start.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index d7e494f83a..bced574c16 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -4,11 +4,14 @@ set -e : ${KEYSTONE_ADMIN_PASSWORD:=kolla} : ${ADMIN_TENANT_NAME:=admin} +: ${KEYSTONE_PUBLIC_SERVICE_HOST:=$KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR} +: ${KEYSTONE_ADMIN_SERVICE_HOST:=$KEYSTONE_ADMIN_PORT_35357_TCP_ADDR} . /opt/kolla/kolla-common.sh check_for_db check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_DB_PASSWORD \ - KEYSTONE_ADMIN_PASSWORD ADMIN_TENANT_NAME + KEYSTONE_ADMIN_PASSWORD ADMIN_TENANT_NAME \ + KEYSTONE_PUBLIC_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST dump_vars mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" mysql <