openstack
/
puppet-vitrage
Code Issues Proposed changes

Adapt to new type validation in puppetlabs-apache 

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: Id33d0bb0cd09af5d653c14e50ac6b3c1745593b6
This commit is contained in:
Takashi Kajinami 2022-08-02 23:14:18 +09:00
parent cce2e3d977
commit 15068f18e8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/wsgi/apache.pp
View File

@ -51,7 +51,7 @@
#
# [*priority*]
# (optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (optional) The number of threads for the vhost.
@ -59,11 +59,11 @@
#
# [*access_log_file*]
# The log file name for the virtualhost.
# 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.
@ -126,9 +126,9 @@ class vitrage::wsgi::apache (
$ssl_crl = undef,
$ssl_certs_dir = undef,
$threads = 1,
$priority = '10',
$access_log_file = false,
$access_log_format = false,
$priority = 10,
$access_log_file = undef,
$access_log_format = undef,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$headers = undef,

5
spec/classes/vitrage_wsgi_apache_spec.rb
View File

@ -9,6 +9,7 @@ describe 'vitrage::wsgi::apache' do
:bind_port => 8999,
:group => 'vitrage',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -22,8 +23,8 @@ describe 'vitrage::wsgi::apache' do
:headers => nil,
:request_headers => nil,
:custom_wsgi_process_options => {},
:access_log_file => false,
:access_log_format => false,
:access_log_file => nil,
:access_log_format => nil,
)}
end