diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-03-11 09:35:00 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-03-18 10:33:42 -0400 |
| commit | 4075c851edc3339adee8ef02bcc291e21b8a738c (patch) | |
| tree | 0c5e56fd03bfc014a1f2dbf5f4ad8b511eca57b6 /docker/glance/glance-api | |
| parent | 53d7e3b6fa12169463688410202e4f47e358fc06 (diff) | |
| download | kolla-4075c851edc3339adee8ef02bcc291e21b8a738c.tar.gz kolla-4075c851edc3339adee8ef02bcc291e21b8a738c.zip | |
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 <charcrou@cisco.com>
Change-Id: Ide2304b787d4c3bf6fb3949f09e2cf1f450c2173
Diffstat (limited to 'docker/glance/glance-api')
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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}" |