From f642fd7b2da8f96db031e02e61e0df7ec955f738 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 20 Mar 2015 10:48:06 -0700 Subject: [PATCH] Don't kill keystone, but instead wait for it to finish at the end use the bash wait builtin to wait for the keystone process to exit. Change-Id: I03057e7925e7e41120c163c0be22ade75050d9f1 --- docker/keystone/start.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index 829caf6e9e..29ce347551 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