openstack/puppet-keystone
Code Issues Proposed changes

Merge "Fix dependency to purge default vhost config"

Browse Source
This commit is contained in:
Zuul
2022-08-29 17:00:55 +00:00
committed by Gerrit Code Review
parent f5cb86159a 2163a8f2bb
commit 72dbb9ccf2
1 changed files with 4 additions and 2 deletions
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, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
) inherits keystone::params { ) {
include keystone::deps include keystone::deps
include keystone::params
Anchor['keystone::install::end'] -> Class['apache']
::openstacklib::wsgi::apache { 'keystone_wsgi': ::openstacklib::wsgi::apache { 'keystone_wsgi':
servername => $servername, servername => $servername,
@@ -210,7 +213,6 @@ class keystone::wsgi::apache (
error_log_file => $error_log_file, error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe, error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog, error_log_syslog => $error_log_syslog,
require => Anchor['keystone::install::end'],
} }
# Workaround to empty Keystone vhost that is provided & activated by default with running # Workaround to empty Keystone vhost that is provided & activated by default with running