diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-02 13:53:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-02 13:53:06 +0000 |
| commit | ba175c61e188a8aa286947154f42cf081dd8937e (patch) | |
| tree | 9ab438c0389a478aa194897435d7c2da3d542fc6 | |
| parent | 92b129968d1b324867fc459746bcfaacb9905a8d (diff) | |
| parent | 056e02d0d3671cdb5161d3fa31dd21fc5349bab4 (diff) | |
| download | kolla-ba175c61e188a8aa286947154f42cf081dd8937e.tar.gz kolla-ba175c61e188a8aa286947154f42cf081dd8937e.zip | |
Merge "Simplify `wait_for` calls"
| -rw-r--r-- | docker/base/kolla-common.sh | 2 | ||||
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 6 | ||||
| -rwxr-xr-x | docker/glance/glance-registry/start.sh | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/docker/base/kolla-common.sh b/docker/base/kolla-common.sh index 1a6b0c815..8c2ef5ec1 100644 --- a/docker/base/kolla-common.sh +++ b/docker/base/kolla-common.sh @@ -49,7 +49,7 @@ wait_for() { if [ -z "$loops" -o -z "$sleeptime" -o -z "$command" ]; then echo "wait_for is missing a required parameter" - return 1 + exit 1 fi local i=0 diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index a049b2841..4de0ef05e 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -11,11 +11,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ PUBLIC_IP -wait_for 30 1 keystone \ - --os-auth-url=http://${KEYSTONE_PUBLIC_SERVICE_HOST}:35357/v2.0 \ - --os-username=admin --os-tenant-name=${ADMIN_TENANT_NAME} \ - --os-password=${KEYSTONE_ADMIN_PASSWORD} endpoint-list -fail_unless_os_service_running keystone +wait_for 30 1 check_for_os_service_running keystone export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 9a6271afe..2337727e8 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -7,8 +7,7 @@ set -e check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD # lets wait for the DB to be available -wait_for 25 1 mysql -h ${MARIADB_SERVICE_HOST} -u root -p"${DB_ROOT_PASSWORD}" -e 'status;' -fail_unless_db +wait_for 25 1 check_for_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8; |