diff options
| author | Martin André <martin.andre@kvhasia.com> | 2014-12-01 14:50:58 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2014-12-03 10:22:18 +0900 |
| commit | 21f28309e7a15f25e1763611d18330145e0ff0fa (patch) | |
| tree | 2314b24ba5bea55bc426f73d45a6a93f5608dd56 | |
| parent | a3d88c1a61c9943ba525eb94d990a69d283b0054 (diff) | |
| download | kolla-21f28309e7a15f25e1763611d18330145e0ff0fa.tar.gz kolla-21f28309e7a15f25e1763611d18330145e0ff0fa.zip | |
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
| -rwxr-xr-x | docker/keystone/start.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index d7e494f83..bced574c1 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 <<EOF |