diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-21 20:53:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-21 20:53:47 +0000 |
| commit | 005ca3d90e79dce1df244d866bf1348fc910f29f (patch) | |
| tree | c13507792040afe0bea1d2bd0325595dbdeb6abe | |
| parent | a2eb42744baaf1c4af5e4dbbf11435622ec0c011 (diff) | |
| parent | f8768acff73352492a14dfc0a282286df53abdad (diff) | |
| download | kolla-005ca3d90e79dce1df244d866bf1348fc910f29f.tar.gz kolla-005ca3d90e79dce1df244d866bf1348fc910f29f.zip | |
Merge "remove wait_for from glance-api"
| -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}" \ |