From 2163a8f2bb6b6bca3156608ee06ce8834ec10873 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 27 Aug 2022 22:58:17 +0900
Subject: [PATCH] Fix dependency to purge default vhost config

It turned out defining dependency for openstacklib::wsgi::apache
doesn't properly enforce resource order and the default vhost file
is not purged properly.
This change adds the more explicit dependency to enforce the order
properly.

Change-Id: I2a01de89c43000bfc6f24dfc756806b968b5efd6
---
 manifests/wsgi/apache.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index c79f601c3..78e511168 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -168,9 +168,12 @@ class keystone::wsgi::apache (
   $request_headers                   = undef,
   $vhost_custom_fragment             = undef,
   $custom_wsgi_process_options       = {},
-) inherits keystone::params {
+) {
 
   include keystone::deps
+  include keystone::params
+
+  Anchor['keystone::install::end'] -> Class['apache']
 
   ::openstacklib::wsgi::apache { 'keystone_wsgi':
     servername                  => $servername,
@@ -210,7 +213,6 @@ class keystone::wsgi::apache (
     error_log_file              => $error_log_file,
     error_log_pipe              => $error_log_pipe,
     error_log_syslog            => $error_log_syslog,
-    require                     => Anchor['keystone::install::end'],
   }
 
   # Workaround to empty Keystone vhost that is provided & activated by default with running