diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-25 03:26:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-25 03:26:42 +0000 |
| commit | 5d1f194113f8db7168d9aa2b4cf418136f1eb9a3 (patch) | |
| tree | 7bb07db0b17dbe051bb36e9ddf7359b862cbf5a4 /docker | |
| parent | 24577bdeac6c598a8f4d549623af20da37624789 (diff) | |
| parent | 29a9515365c4588c3bff2cb0535625c6da55f80e (diff) | |
| download | kolla-5d1f194113f8db7168d9aa2b4cf418136f1eb9a3.tar.gz kolla-5d1f194113f8db7168d9aa2b4cf418136f1eb9a3.zip | |
Merge "Add more checks to the glance containers"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/glance/glance-api/start.sh | 11 | ||||
| -rw-r--r-- | docker/common/glance/glance-base/config-glance.sh | 6 | ||||
| -rwxr-xr-x | docker/common/glance/glance-registry/start.sh | 6 |
3 files changed, 15 insertions, 8 deletions
diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh index c546333f4..9140afbf1 100755 --- a/docker/common/glance/glance-api/start.sh +++ b/docker/common/glance/glance-api/start.sh @@ -4,12 +4,13 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-glance.sh -: ${GLANCE_API_SERVICE_HOST:=$PUBLIC_IP} -check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ - GLANCE_KEYSTONE_USER GLANCE_KEYSTONE_PASSWORD \ - ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ - PUBLIC_IP +check_required_vars ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ + GLANCE_KEYSTONE_PASSWORD GLANCE_KEYSTONE_USER \ + GLANCE_REGISTRY_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_AUTH_PROTOCOL PUBLIC_IP \ + RABBITMQ_SERVICE_HOST fail_unless_os_service_running keystone diff --git a/docker/common/glance/glance-base/config-glance.sh b/docker/common/glance/glance-base/config-glance.sh index 97d076c11..51bb56667 100644 --- a/docker/common/glance/glance-base/config-glance.sh +++ b/docker/common/glance/glance-base/config-glance.sh @@ -11,7 +11,11 @@ set -e : ${KEYSTONE_AUTH_PROTOCOL:=http} : ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR} -check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD + +check_required_vars ADMIN_TENANT_NAME GLANCE_DB_NAME GLANCE_DB_PASSWORD \ + GLANCE_DB_USER GLANCE_KEYSTONE_PASSWORD \ + GLANCE_KEYSTONE_USER KEYSTONE_PUBLIC_SERVICE_HOST \ + MARIADB_SERVICE_HOST dump_vars cat > /openrc <<EOF diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh index 6b12d8fee..ec646eb70 100755 --- a/docker/common/glance/glance-registry/start.sh +++ b/docker/common/glance/glance-registry/start.sh @@ -5,8 +5,10 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-glance.sh -check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD \ - INIT_GLANCE_DB + +check_required_vars DB_ROOT_PASSWORD GLANCE_DB_NAME \ + GLANCE_DB_PASSWORD GLANCE_DB_USER \ + MARIADB_SERVICE_HOST # lets wait for the DB to be available wait_for 25 1 check_for_db |