diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 18:54:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 18:54:43 +0000 |
| commit | 731d5205cbed74028bda0883a5432afc476605b6 (patch) | |
| tree | 38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/glance | |
| parent | 15eb390ab307885943280a4b5d1287dc580517aa (diff) | |
| parent | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff) | |
| download | kolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz kolla-731d5205cbed74028bda0883a5432afc476605b6.zip | |
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/glance')
| -rwxr-xr-x | docker/common/glance/glance-api/config-internal.sh | 15 | ||||
| -rw-r--r-- | docker/common/glance/glance-base/config-glance.sh | 19 | ||||
| -rwxr-xr-x | docker/common/glance/glance-registry/config-internal.sh | 6 |
3 files changed, 21 insertions, 19 deletions
diff --git a/docker/common/glance/glance-api/config-internal.sh b/docker/common/glance/glance-api/config-internal.sh index 9140afbf1..45af8d7ec 100755 --- a/docker/common/glance/glance-api/config-internal.sh +++ b/docker/common/glance/glance-api/config-internal.sh @@ -5,11 +5,16 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-glance.sh -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 \ +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 51bb56667..2823af314 100644 --- a/docker/common/glance/glance-base/config-glance.sh +++ b/docker/common/glance/glance-base/config-glance.sh @@ -4,17 +4,13 @@ set -e . /opt/kolla/kolla-common.sh -: ${ADMIN_TENANT_NAME:=admin} -: ${GLANCE_DB_NAME:=glance} -: ${GLANCE_DB_USER:=glance} -: ${GLANCE_KEYSTONE_USER:=glance} -: ${KEYSTONE_AUTH_PROTOCOL:=http} -: ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR} - - -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 \ +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 @@ -64,4 +60,3 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do connection \ "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}" done - diff --git a/docker/common/glance/glance-registry/config-internal.sh b/docker/common/glance/glance-registry/config-internal.sh index ec646eb70..c0ce4df5c 100755 --- a/docker/common/glance/glance-registry/config-internal.sh +++ b/docker/common/glance/glance-registry/config-internal.sh @@ -6,8 +6,10 @@ set -e . /opt/kolla/config-glance.sh -check_required_vars DB_ROOT_PASSWORD GLANCE_DB_NAME \ - GLANCE_DB_PASSWORD GLANCE_DB_USER \ +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 |
