From 2e6f33e11624250fdb9db29e675d8b5f804b128c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 11 Jan 2022 18:48:43 +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: I6614e66c5a6d17e3850d73564a487a4932ea0f7a
---
 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 14d2ba00..b9235785 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -137,6 +137,8 @@ class manila::wsgi::apache (
   include manila::deps
   include manila::params
 
+  Anchor['manila::install::end'] -> Class['apache']
+
   ::openstacklib::wsgi::apache { 'manila_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
@@ -166,6 +168,5 @@ class manila::wsgi::apache (
     access_log_file             => $access_log_file,
     access_log_format           => $access_log_format,
     error_log_file              => $error_log_file,
-    require                     => Anchor['manila::install::end'],
   }
 }