openstack
/
puppet-openstacklib
Code Issues Proposed changes

Merge "Adapt to new type validation in puppetlabs-apache"

This commit is contained in:
Zuul 2022-08-08 16:56:19 +00:00 committed by Gerrit Code Review
parent f762b51ac8 8334afc2a6
commit 81af4a0476
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/wsgi/apache.pp
View File

@ -49,7 +49,7 @@
#
# [*priority*]
# (Optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*setenv*]
# (Optional) Set environment variables for the vhost.
@ -203,20 +203,20 @@
# [*access_log_file*]
# (Optional) The log file name for the virtualhost.
# access_log_file and access_log_pipe is mutually exclusive.
# Defaults to false
# Defaults to undef
#
# [*access_log_pipe*]
# (Optional) Specifies a pipe where Apache sends access logs for the virtualhost.
# access_log_file and access_log_pipe is mutually exclusive.
# Defaults to false
# Defaults to undef
#
# [*access_log_syslog*]
# (Optional) Sends the virtualhost access log messages to syslog.
# Defaults to false
# Defaults to undef
#
# [*access_log_format*]
# (Optional) The log format for the virtualhost.
# Defaults to false
# Defaults to undef
#
# [*error_log_file*]
# (Optional) The error log file name for the virtualhost.
@ -243,7 +243,7 @@ define openstacklib::wsgi::apache (
$bind_port = undef,
$group = undef,
$path = '/',
$priority = '10',
$priority = 10,
$setenv = [],
$ssl = false,
$ssl_ca = undef,
@ -276,10 +276,10 @@ define openstacklib::wsgi::apache (
$custom_wsgi_script_aliases = undef,
$vhost_custom_fragment = undef,
$allow_encoded_slashes = undef,
$access_log_file = false,
$access_log_pipe = false,
$access_log_syslog = false,
$access_log_format = false,
$access_log_file = undef,
$access_log_pipe = undef,
$access_log_syslog = undef,
$access_log_format = undef,
$error_log_file = undef,
$error_log_pipe = undef,
$error_log_syslog = undef,

11
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@ -38,8 +38,6 @@ describe 'openstacklib::wsgi::apache' do
:wsgi_script_dir => '/var/www/cgi-bin/keystone',
:wsgi_script_file => 'main',
:wsgi_script_source => '/usr/share/keystone/keystone.wsgi',
:access_log_file => false,
:access_log_format => false,
}
end
@ -93,6 +91,9 @@ describe 'openstacklib::wsgi::apache' do
:request_headers => nil,
:aliases => nil,
:setenvif => ['X-Forwarded-Proto https HTTPS=1'],
# TODO(tkajinam): Replace false by undef once the new puppetlabs-apache
# is released.
# https://github.com/puppetlabs/puppetlabs-apache/commit/f41251e3
:access_log_file => false,
:access_log_pipe => false,
:access_log_syslog => false,
@ -115,11 +116,13 @@ describe 'openstacklib::wsgi::apache' do
:wsgi_script_source => '/usr/share/keystone/keystone.wsgi',
:wsgi_pass_authorization => 'On',
:wsgi_chunked_request => 'On',
:custom_wsgi_script_aliases => { '/admin' => '/var/www/cgi-bin/keystone/admin' },
:custom_wsgi_script_aliases => {
'/admin' => '/var/www/cgi-bin/keystone/admin'
},
:headers => 'set X-Frame-Options "DENY"',
:request_headers => 'set Content-Type "application/json"',
:aliases => [
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', },
{ 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', }
],
:servername => 'dummy.host',
:bind_host => '10.42.51.1',