diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-18 22:56:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-18 22:56:44 +0000 |
| commit | f2a38c55bd8672c57402efdcf4d59ff428fe780f (patch) | |
| tree | 33ba404df97d7af76071ca4510ee6df4698eb081 /docker/glance | |
| parent | 16076af97a383368dc45a2c7df1cbc5ed603e19c (diff) | |
| parent | 4075c851edc3339adee8ef02bcc291e21b8a738c (diff) | |
| download | kolla-f2a38c55bd8672c57402efdcf4d59ff428fe780f.tar.gz kolla-f2a38c55bd8672c57402efdcf4d59ff428fe780f.zip | |
Merge "The wait_for function needs to be added into all the images"
Diffstat (limited to 'docker/glance')
| -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}" |