openstack
/
puppet-magnum
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: I0c686d7c2d90aa94648ef4a8f9b86bd05e6d498b
This commit is contained in:
Takashi Kajinami 2022-08-02 20:30:27 +09:00
parent 743aabc19d
commit 28fe574fed
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

@ -47,7 +47,7 @@
#
# [*priority*]
# (Optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (Optional) The number of threads for the vhost.
@ -69,11 +69,11 @@
#
# [*access_log_file*]
# (Optional) The log file name for the virtualhost.
# 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.
@ -116,9 +116,9 @@ class magnum::wsgi::apache (
$ssl_certs_dir = undef,
$wsgi_process_display_name = 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/magnum_wsgi_apache_spec.rb
View File

@ -9,6 +9,7 @@ describe 'magnum::wsgi::apache' do
:bind_port => 9511,
:group => 'magnum',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -22,8 +23,8 @@ describe 'magnum::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