openstack/kolla-ansible
Code Issues Proposed changes

Simplify wait_for calls

Browse Source 
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
This commit is contained in:
Martin André 2015-03-30 10:28:42 +09:00
parent 34872c1c2f
commit 056e02d0d3
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/kolla-common.sh
View File

@ -49,7 +49,7 @@ wait_for() {
if [ -z "$loops" -o -z "$sleeptime" -o -z "$command" ]; then if [ -z "$loops" -o -z "$sleeptime" -o -z "$command" ]; then
echo "wait_for is missing a required parameter" echo "wait_for is missing a required parameter"
return 1 exit 1
fi fi
local i=0 local i=0

6
docker/glance/glance-api/start.sh
View File

@ -11,11 +11,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
PUBLIC_IP PUBLIC_IP
wait_for 30 1 keystone \ wait_for 30 1 check_for_os_service_running 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
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0" export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"

3
docker/glance/glance-registry/start.sh
View File

@ -7,8 +7,7 @@ set -e
check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD
# lets wait for the DB to be available # 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;' wait_for 25 1 check_for_db
fail_unless_db
mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <<EOF 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; CREATE DATABASE IF NOT EXISTS ${GLANCE_DB_NAME} DEFAULT CHARACTER SET utf8;