openstack/kolla
Code Issues Proposed changes

Don't kill keystone, but instead wait for it to finish at the end

Browse Source 
use the bash wait builtin to wait for the keystone process to exit.

Change-Id: I03057e7925e7e41120c163c0be22ade75050d9f1
This commit is contained in:
Steven Dake 2015-03-20 10:48:06 -07:00
parent 9b7a844094
commit f642fd7b2d
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/keystone/start.sh
View File

@ -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