openstack
/
puppet-horizon
Code Issues Proposed changes

Remove unnecessary workaround for ensure_resources 

This actually reverts commit 8530df74de .
The ensure_resources function no longer converts undef to an empty
string in recent puppet versions, and the original bug is no longer
reproduced.

Related-Bug: #1371345
Change-Id: I8fc0a9f5172a7cea1ca785a38121e9be61ea54eb
This commit is contained in:
Takashi Kajinami 2022-05-13 00:48:44 +09:00
parent 49a20369cb
commit 9281638bab
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
manifests/wsgi/apache.pp
View File

@ -256,39 +256,30 @@ class horizon::wsgi::apache (
$custom_wsgi_process_options
)
$default_vhost_conf_no_ip = {
servername => $servername,
serveraliases => any2array($server_aliases),
docroot => '/var/www/',
access_log_file => $access_log_file,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
priority => $priority,
aliases => [{
$default_vhost_conf = {
ip => $bind_address,
servername => $servername,
serveraliases => any2array($server_aliases),
docroot => '/var/www/',
access_log_file => $access_log_file,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
priority => $priority,
aliases => [{
alias => "${root_url_real}/static",
path => "${root_path}/static",
}],
port => $http_port,
ssl_cert => $ssl_cert,
ssl_key => $ssl_key,
ssl_ca => $ssl_ca,
ssl_verify_client => $ssl_verify_client,
wsgi_script_aliases => hash([$script_url, $::horizon::params::django_wsgi]),
wsgi_import_script => $::horizon::params::django_wsgi,
wsgi_process_group => $::horizon::params::wsgi_group,
wsgi_application_group => $::horizon::params::wsgi_application_group,
redirectmatch_status => $redirect_type,
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
}
# Only add the 'ip' element to the $default_vhost_conf hash if it was explicitly
# specified in the instantiation of the class. This is because ip => undef gets
# changed to ip => '' via the Puppet function API when ensure_resource is called.
# See https://bugs.launchpad.net/puppet-horizon/+bug/1371345
if $bind_address {
$default_vhost_conf = merge($default_vhost_conf_no_ip, { ip => $bind_address })
} else {
$default_vhost_conf = $default_vhost_conf_no_ip
port => $http_port,
ssl_cert => $ssl_cert,
ssl_key => $ssl_key,
ssl_ca => $ssl_ca,
ssl_verify_client => $ssl_verify_client,
wsgi_script_aliases => hash([$script_url, $::horizon::params::django_wsgi]),
wsgi_import_script => $::horizon::params::django_wsgi,
wsgi_process_group => $::horizon::params::wsgi_group,
wsgi_application_group => $::horizon::params::wsgi_application_group,
redirectmatch_status => $redirect_type,
options => ['-Indexes', '+FollowSymLinks','+MultiViews'],
}
if $listen_ssl and $ssl_redirect {