openstack/puppet-zaqar
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: Ic4160b208ff1d728cab2b77c9261cb18deec8c27
This commit is contained in:
Takashi Kajinami 2022-08-02 23:15:35 +09:00
parent 5bfe646a17
commit e803994bbf
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

@ -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,11 +68,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.
@ -120,9 +120,9 @@ class zaqar::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/zaqar_wsgi_apache_spec.rb
View File

@ -9,6 +9,7 @@ describe 'zaqar::wsgi::apache' do
:bind_port => 8888,
:group => 'zaqar',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -19,8 +20,8 @@ describe 'zaqar::wsgi::apache' do
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'zaqar-server',
:wsgi_script_source => platform_params[:wsgi_script_source],
:access_log_file => false,
:access_log_format => false,
:access_log_file => nil,
:access_log_format => nil,
:custom_wsgi_process_options => {},
)}
end