openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-03-21 03:19:48 +00:00 committed by Gerrit Code Review
commit be79b50b31
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}" \ -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}" -P "http://${KEYSTONE_PUBLIC_SERVICE_HOST}:${KEYSTONE_PUBLIC_SERVICE_PORT}/v${KEYSTONE_API_VERSION}"
# Stop Keystone service # Wait on all jobs to exit before proceeding (see man wait)
echo "Stopping Keystone for changes to take effect." wait
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