remove wait_for from glance-api

For some reason glance sometimes fails to permanently find keystone
while other services do find keystone.  The host also has full access
to keystone.  Change wait_for to fail_unless.

This could be a docker bug, a wait_for bug, or some other problem.

Change-Id: I02d611d65b7ffddb9c27101fd60e2a8b7cc25658
This commit is contained in:
Steven Dake 2015-04-14 11:20:03 -07:00
parent aa5dba96da
commit f8768acff7

View File

@ -11,10 +11,10 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
PUBLIC_IP
wait_for 30 1 check_for_os_service_running keystone
fail_unless_os_service_running keystone
export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
export SERVICE_ENDPOINT="http://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
crux user-create --update \
-n "${GLANCE_KEYSTONE_USER}" \