openstack/devstack
Code Issues Proposed changes

Merge "Split keystone mod wsgi config from start/stop"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 13:26:27 +00:00 committed by Gerrit Code Review
commit 7672ad1dbc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/keystone
View File

@ -6,6 +6,7 @@
# - ``functions`` file # - ``functions`` file
# - ``tls`` file # - ``tls`` file
# - ``DEST``, ``STACK_USER`` # - ``DEST``, ``STACK_USER``
# - ``FILES``
# - ``IDENTITY_API_VERSION`` # - ``IDENTITY_API_VERSION``
# - ``BASE_SQL_CONN`` # - ``BASE_SQL_CONN``
# - ``SERVICE_HOST``, ``SERVICE_PROTOCOL`` # - ``SERVICE_HOST``, ``SERVICE_PROTOCOL``
@ -104,18 +105,13 @@ KEYSTONE_SERVICE_URI=${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${K
# cleanup_keystone() - Remove residual data files, anything left over from previous # cleanup_keystone() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up # runs that a clean run would need to clean up
function cleanup_keystone { function cleanup_keystone {
# kill instances (nova) _cleanup_keystone_apache_wsgi
# delete image files (glance)
# This function intentionally left blank
:
} }
# _cleanup_keystone_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file # _cleanup_keystone_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file
function _cleanup_keystone_apache_wsgi { function _cleanup_keystone_apache_wsgi {
sudo rm -f $KEYSTONE_WSGI_DIR/*.wsgi sudo rm -f $KEYSTONE_WSGI_DIR/*.wsgi
disable_apache_site keystone
sudo rm -f $(apache_site_config_for keystone) sudo rm -f $(apache_site_config_for keystone)
restart_apache_server
} }
# _config_keystone_apache_wsgi() - Set WSGI config files of Keystone # _config_keystone_apache_wsgi() - Set WSGI config files of Keystone
@ -145,7 +141,6 @@ function _config_keystone_apache_wsgi {
s|%USER%|$STACK_USER|g s|%USER%|$STACK_USER|g
s|%ERRORLOGFORMAT%|$errorlogformat|g; s|%ERRORLOGFORMAT%|$errorlogformat|g;
" -i $keystone_apache_conf " -i $keystone_apache_conf
enable_apache_site keystone
} }
# configure_keystone() - Set config files, create data dirs, etc # configure_keystone() - Set config files, create data dirs, etc
@ -473,6 +468,7 @@ function start_keystone {
fi fi
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
enable_apache_site keystone
restart_apache_server restart_apache_server
tail_log key /var/log/$APACHE_NAME/keystone.log tail_log key /var/log/$APACHE_NAME/keystone.log
tail_log key-access /var/log/$APACHE_NAME/keystone_access.log tail_log key-access /var/log/$APACHE_NAME/keystone_access.log
@ -498,10 +494,12 @@ function start_keystone {
# stop_keystone() - Stop running processes # stop_keystone() - Stop running processes
function stop_keystone { function stop_keystone {
if [ "$KEYSTONE_USE_MOD_WSGI" == "True" ]; then
disable_apache_site keystone
restart_apache_server
fi
# Kill the Keystone screen window # Kill the Keystone screen window
stop_process key stop_process key
# Cleanup the WSGI files and VHOST
_cleanup_keystone_apache_wsgi
} }
function is_keystone_enabled { function is_keystone_enabled {