diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-08 19:22:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-08 19:22:12 +0000 |
| commit | 6fabb5c9aab82bb85e12ddf5c10b3a32175d8fbb (patch) | |
| tree | 240c2a4c37b8348c5c66028d3a842f5602d10a70 /docker | |
| parent | 528102a0ee14b6d9b110ecb3699f2dd02a8ab634 (diff) | |
| parent | 21f28309e7a15f25e1763611d18330145e0ff0fa (diff) | |
| download | kolla-6fabb5c9aab82bb85e12ddf5c10b3a32175d8fbb.tar.gz kolla-6fabb5c9aab82bb85e12ddf5c10b3a32175d8fbb.zip | |
Merge "Check for all required variables in keystone start.sh"
Diffstat (limited to 'docker')
| -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 |