1. devstack
  2. Commit 5631ca5e126ec2d4c6802d09e312fcb8c1ab4952
Browse code

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

Rob Crittenden authored on 2016/08/03 02:19:14
Showing 2 changed files
clean.sh
History View file @ 5631ca5
... ... 
@@ -95,6 +95,7 @@ cleanup_keystone
95 95 
 cleanup_nova
96 96 
 cleanup_neutron
97 97 
 cleanup_swift
98 
+cleanup_horizon
98 99
99 100 
 if is_service_enabled ldap; then
100 101 
     cleanup_ldap
lib/horizon
History View file @ 5631ca5
... ... 
@@ -69,9 +69,8 @@ function _horizon_config_set {
69 69 
 # cleanup_horizon() - Remove residual data files, anything left over from previous
70 70 
 # runs that a clean run would need to clean up
71 71 
 function cleanup_horizon {
72 
-    local horizon_conf
73 
-    horizon_conf=$(apache_site_config_for horizon)
74 
-    sudo rm -f $horizon_conf
72 
+    disable_apache_site horizon
73 
+    sudo rm -f $(apache_site_config_for horizon)
75 74 
 }
76 75
77 76 
 # configure_horizon() - Set config files, create data dirs, etc