From ec498cd0619805c409b28f81c6a7bcd3a01136ed Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 6 Oct 2016 15:00:44 -0400
Subject: [PATCH] remove sites-enabled/keystone.conf link on clean
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
---
lib/keystone | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/lib/keystone b/lib/keystone
index 13fa50b17e..f9ee8eb761 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -25,7 +25,6 @@
# - create_keystone_accounts
# - stop_keystone
# - cleanup_keystone
-# - _cleanup_keystone_apache_wsgi
# Save trace setting
_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
# runs that a clean run would need to clean up
function cleanup_keystone {
- _cleanup_keystone_apache_wsgi
-}
-
-# _cleanup_keystone_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file
-function _cleanup_keystone_apache_wsgi {
+ disable_apache_site keystone
sudo rm -f $(apache_site_config_for keystone)
}