diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-21 03:19:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-21 03:19:48 +0000 |
| commit | be79b50b3178b882fe20bdc20d8d082f4c45a3db (patch) | |
| tree | 5f02569b92983a1c4e81fb8b581a08e246ea0ab0 /docker | |
| parent | f84c2b1705bf4568387a0e0e82327b221218fef5 (diff) | |
| parent | f642fd7b2da8f96db031e02e61e0df7ec955f738 (diff) | |
| download | kolla-be79b50b3178b882fe20bdc20d8d082f4c45a3db.tar.gz kolla-be79b50b3178b882fe20bdc20d8d082f4c45a3db.zip | |
Merge "Don't kill keystone, but instead wait for it to finish at the end"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/keystone/start.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 2f6d902d6..420295dcb 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -158,17 +158,5 @@ crux endpoint-create --remove-all \ -A "http://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v${KEYSTONE_API_VERSION}" \ -P "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v${KEYSTONE_API_VERSION}" -# Stop Keystone service -echo "Stopping Keystone for changes to take effect." -kill -TERM $PID - -# Check to make sure the service is stopped -echo "Making sure the Keystone service is stopped." -while curl -o /dev/null -s --fail ${SERVICE_ENDPOINT}; do - echo "waiting for keystone @ ${SERVICE_ENDPOINT} to exit" - sleep 1; -done - -# Start Keystone again for final changes to take effect -echo "Running keystone service." -exec /usr/bin/keystone-all +# Wait on all jobs to exit before proceeding (see man wait) +wait |