From a44fa9b8d172dc6a13c8cf9bcf1262d96c26cd40 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 11 Jan 2022 18:45:03 +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: I8a15ccf292b5f7cd90bb45624780f0ef012abe38
---
 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 6e2f392e..ca6fca1b 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -134,6 +134,8 @@ class ironic::wsgi::apache (
   include ironic::deps
   include ironic::params
 
+  Anchor['ironic::install::end'] -> Class['apache']
+
   ::openstacklib::wsgi::apache { 'ironic_wsgi':
     bind_host                   => $bind_host,
     bind_port                   => $port,
@@ -163,6 +165,5 @@ class ironic::wsgi::apache (
     access_log_format           => $access_log_format,
     error_log_file              => $error_log_file,
     custom_wsgi_process_options => $custom_wsgi_process_options,
-    require                     => Anchor['ironic::install::end'],
   }
 }