openstack
/
puppet-keystone
Code Issues Proposed changes

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: I2a01de89c43000bfc6f24dfc756806b968b5efd6
This commit is contained in:
Takashi Kajinami 2022-08-27 22:58:17 +09:00
parent d5309eccc6
commit 2163a8f2bb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/wsgi/apache.pp
View File

@ -168,9 +168,12 @@ class keystone::wsgi::apache (
$request_headers = undef,
$vhost_custom_fragment = undef,
$custom_wsgi_process_options = {},
) inherits keystone::params {
) {
include keystone::deps
include keystone::params
Anchor['keystone::install::end'] -> Class['apache']
::openstacklib::wsgi::apache { 'keystone_wsgi':
servername => $servername,
@ -210,7 +213,6 @@ class keystone::wsgi::apache (
error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog,
require => Anchor['keystone::install::end'],
}
# Workaround to empty Keystone vhost that is provided & activated by default with running