openstack
/
devstack
Code Issues Proposed changes

Clean up Horizon Apache configuration files in clean.sh 

The horizon cleanup function wasn't being called at all during
cleanup which left the Apache configuration.

Change-Id: Iff5336d0c5e79cfc82f1c648afaabb869d86020e
This commit is contained in:
Rob Crittenden 2016-08-02 13:19:14 -04:00
parent e56318f9bc
commit 5631ca5e12
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clean.sh
View File

@ -95,6 +95,7 @@ cleanup_keystone
cleanup_nova
cleanup_neutron
cleanup_swift
cleanup_horizon
if is_service_enabled ldap; then
cleanup_ldap

5
lib/horizon
View File

@ -69,9 +69,8 @@ function _horizon_config_set {
# cleanup_horizon() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_horizon {
local horizon_conf
horizon_conf=$(apache_site_config_for horizon)
sudo rm -f $horizon_conf
disable_apache_site horizon
sudo rm -f $(apache_site_config_for horizon)
}
# configure_horizon() - Set config files, create data dirs, etc