diff options
| author | Steven Dake <stdake@cisco.com> | 2015-04-14 11:20:03 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-04-14 11:20:03 -0700 |
| commit | f8768acff73352492a14dfc0a282286df53abdad (patch) | |
| tree | e408b49d302e3cfcd21aade2d2578647272ca1bf | |
| parent | aa5dba96da5a5e5a9ebda4afbcb428c6b5760d59 (diff) | |
| download | kolla-f8768acff73352492a14dfc0a282286df53abdad.tar.gz kolla-f8768acff73352492a14dfc0a282286df53abdad.zip | |
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
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index 4de0ef05e..e5e327a5b 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -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}" \ |