openstack
/
puppet-glance
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: I652d82c449371bf4df73d1384ddf1633a76224e9
This commit is contained in:
Takashi Kajinami 2022-08-02 23:18:27 +09:00
parent 09699ef632
commit 23584e89be
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/wsgi/apache.pp
View File

@ -65,19 +65,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.
@ -139,10 +139,10 @@ class glance::wsgi::apache (
$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,
$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/glance_wsgi_apache_spec.rb
View File

@ -11,6 +11,7 @@ describe 'glance::wsgi::apache' do
:bind_port => 9292,
:group => 'glance',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -25,10 +26,10 @@ describe 'glance::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,