openstack/puppet-cinder
Code Issues Proposed changes

Adapt to new type validation in puppetlabs-apache

Browse Source 
The puppetlabs-apache module is enforcing more strict data type
validation[1].

This change updates the default values to adapt to that change.

[1] f41251e336

Closes-Bug: #1983300
Depends-on: https://review.opendev.org/851652
Change-Id: Ied009d3ccac144f60d0b17567ff083b8f48cea2d
This commit is contained in:
Takashi Kajinami 2022-07-30 22:39:53 +09:00
parent 50ede5b587
commit 58f4fac516
2 changed files with 15 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

@ -46,7 +46,7 @@
#
# [*priority*]
# (optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (optional) The number of threads for the vhost.
@ -68,19 +68,19 @@
#
# [*access_log_file*]
# The log file name for the virtualhost.
# Optional. Defaults to false.
# Optional. Defaults to undef.
#
# [*access_log_pipe*]
# Specifies a pipe where Apache sends access logs for the virtualhost.
# Optional. Defaults to false.
# Optional. Defaults to undef.
#
# [*access_log_syslog*]
# Sends the virtualhost access log messages to syslog.
# Optional. Defaults to false.
# Optional. Defaults to undef.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to false.
# Optional. Defaults to undef.
#
# [*error_log_file*]
# The error log file name for the virtualhost.
@ -141,11 +141,11 @@ class cinder::wsgi::apache (
$ssl_certs_dir = undef,
$wsgi_process_display_name = undef,
$threads = 1,
$priority = '10',
$access_log_file = false,
$access_log_pipe = false,
$access_log_syslog = false,
$access_log_format = false,
$priority = 10,
$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,

9
spec/classes/cinder_wsgi_apache_spec.rb
View File

@ -8,6 +8,7 @@ describe 'cinder::wsgi::apache' do
:bind_port => 8776,
:group => 'cinder',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -21,10 +22,10 @@ describe 'cinder::wsgi::apache' do
:headers => nil,
:request_headers => nil,
:custom_wsgi_process_options => {},
:access_log_file => false,
:access_log_pipe => false,
:access_log_syslog => false,
:access_log_format => false,
:access_log_file => nil,
:access_log_pipe => nil,
:access_log_syslog => nil,
:access_log_format => nil,
:error_log_file => nil,
:error_log_pipe => nil,
:error_log_syslog => nil,