openstack/devstack
Code Issues Proposed changes

remove sites-enabled/keystone.conf link on clean

Browse Source 
doing a clean.sh / stack.sh cycle with USE_SSL=True was failing
because we were no longer cleaning up the keystone site fully, so some
of the early mod_ssl queries hit an invalid apache configuration.

Change-Id: Ic6f3f601e532ec50c0234d928c25b378d9e95e32
This commit is contained in:
Sean Dague 2016-10-06 15:00:44 -04:00
parent 7480276f5e
commit ec498cd061
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/keystone
View File

@ -25,7 +25,6 @@
# - create_keystone_accounts # - create_keystone_accounts
# - stop_keystone # - stop_keystone
# - cleanup_keystone # - cleanup_keystone
# - _cleanup_keystone_apache_wsgi
# Save trace setting # Save trace setting
_XTRACE_KEYSTONE=$(set +o | grep xtrace) _XTRACE_KEYSTONE=$(set +o | grep xtrace)
@ -149,11 +148,7 @@ function is_keystone_enabled {
# 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 {
_cleanup_keystone_apache_wsgi disable_apache_site keystone
}
# _cleanup_keystone_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file
function _cleanup_keystone_apache_wsgi {
sudo rm -f $(apache_site_config_for keystone) sudo rm -f $(apache_site_config_for keystone)
} }