From caa893234e3d93e605057bd75f2c921435904b92 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 11 Jan 2022 18:34:13 +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: I790cbfec3244c18cd48436a42887e9c6ce134701 --- 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 ba744553..f2945914 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -138,6 +138,8 @@ class barbican::wsgi::apache ( include barbican::deps include barbican::params + Anchor['barbican::install::end'] -> Class['apache'] + openstacklib::wsgi::apache { 'barbican_wsgi_main': bind_host => $bind_host, bind_port => $public_port, @@ -167,6 +169,5 @@ class barbican::wsgi::apache ( access_log_format => $access_log_format, error_log_file => $error_log_file, custom_wsgi_process_options => $custom_wsgi_process_options, - require => Anchor['barbican::install::end'] } }