openstack/puppet-watcher
Code Issues Proposed changes

Fix dependency to purge default vhost config

Browse Source 
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: Ie4e5ad1a77eca49115a3e796ecd8130324288f99
This commit is contained in:
Takashi Kajinami 2022-01-11 18:57:18 +09:00
parent cf57b0a804
commit a4eec5ffb6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/wsgi/apache.pp
View File

@ -127,6 +127,8 @@ class watcher::wsgi::apache (
include watcher::deps include watcher::deps
include watcher::params include watcher::params
Anchor['watcher::install::end'] -> Class['apache']
::openstacklib::wsgi::apache { 'watcher_wsgi': ::openstacklib::wsgi::apache { 'watcher_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
@ -151,7 +153,6 @@ class watcher::wsgi::apache (
wsgi_script_dir => $::watcher::params::watcher_wsgi_script_path, wsgi_script_dir => $::watcher::params::watcher_wsgi_script_path,
wsgi_script_file => 'app', wsgi_script_file => 'app',
wsgi_script_source => $::watcher::params::watcher_wsgi_script_source, wsgi_script_source => $::watcher::params::watcher_wsgi_script_source,
require => Anchor['watcher::install::end'],
access_log_file => $access_log_file, access_log_file => $access_log_file,
access_log_format => $access_log_format, access_log_format => $access_log_format,
error_log_file => $error_log_file, error_log_file => $error_log_file,