From 2fb01b0a85a2a661f1440a0dd673fbba931ac3f4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 11 Jan 2022 18:54:34 +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: I5d03a133bb9d6e8a5ed67b7b06ee73608cff37ee --- 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 f3c3b3b..e56869c 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -127,6 +127,8 @@ class zaqar::wsgi::apache ( include zaqar::deps include zaqar::params + Anchor['zaqar::install::end'] -> Class['apache'] + ::openstacklib::wsgi::apache { 'zaqar_wsgi': bind_host => $bind_host, bind_port => $port, @@ -151,7 +153,6 @@ class zaqar::wsgi::apache ( wsgi_script_dir => $::zaqar::params::zaqar_wsgi_script_path, wsgi_script_file => 'zaqar-server', wsgi_script_source => $::zaqar::params::zaqar_wsgi_script_source, - require => Anchor['zaqar::install::end'], vhost_custom_fragment => 'WSGICallableObject app', access_log_file => $access_log_file, access_log_format => $access_log_format,