From 4075c851edc3339adee8ef02bcc291e21b8a738c Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Wed, 11 Mar 2015 09:35:00 -0400 Subject: The wait_for function needs to be added into all the images This affects both fedora and the centos base images. Wait_for will be intregrated into kolla-common. Co-authored by: Charles Crouch Change-Id: Ide2304b787d4c3bf6fb3949f09e2cf1f450c2173 --- docker/glance/glance-api/start.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index 851835449..5dd1da5b3 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 -/opt/kolla/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 +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 check_for_keystone export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}" -- cgit v1.2.3