From 056e02d0d3671cdb5161d3fa31dd21fc5349bab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <martin.andre@kvhasia.com>
Date: Mon, 30 Mar 2015 10:28:42 +0900
Subject: [PATCH] Simplify `wait_for` calls
Rely on the the `check_for_*` functions and remove redundant
`fail_unless_*` calls.
Also change `wait_for` to exit when it is missing a required argument.
Change-Id: I90c4545691d53185556e2838303ac3df0afaf9fa
---
docker/base/kolla-common.sh | 2 +-
docker/glance/glance-api/start.sh | 6 +-----
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 1a6b0c8159..8c2ef5ec1c 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 a049b2841b..4de0ef05e4 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 9a6271afe5..2337727e8b 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;