From 93cd1799a9793aacb91d1579cc2bf9f29af1ac04 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 11 Jan 2022 18:53:45 +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: I51f186b9bfd2208c18b2be8ad05055d33e980dd7
---
 manifests/wsgi/apache.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index d02e0db5..68d08648 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -118,6 +118,8 @@ class sahara::wsgi::apache (
   include sahara::deps
   include sahara::params
 
+  Anchor['sahara::install::end'] -> Class['apache']
+
   ::openstacklib::wsgi::apache { 'sahara_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
@@ -146,6 +148,5 @@ class sahara::wsgi::apache (
     access_log_format           => $access_log_format,
     error_log_file              => $error_log_file,
     custom_wsgi_process_options => $custom_wsgi_process_options,
-    require                     => Anchor['sahara::install::end'],
   }
 }