openstack
/
puppet-gnocchi
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: Ie6310a022e9715336832865741318369bc3fa188
This commit is contained in:
Takashi Kajinami 2022-07-30 22:17:33 +09:00
parent 160e89609b
commit 49d16a2315
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

@ -50,7 +50,7 @@
# #
# [*priority*] # [*priority*]
# (optional) The priority for the vhost. # (optional) The priority for the vhost.
# Defaults to '10' # Defaults to 10
# #
# [*threads*] # [*threads*]
# (optional) The number of threads for the vhost. # (optional) The number of threads for the vhost.
@ -72,11 +72,11 @@
# #
# [*access_log_file*] # [*access_log_file*]
# The log file name for the virtualhost. # The log file name for the virtualhost.
# Optional. Defaults to false. # Optional. Defaults to nil.
# #
# [*access_log_format*] # [*access_log_format*]
# The log format for the virtualhost. # The log format for the virtualhost.
# Optional. Defaults to false. # Optional. Defaults to nil.
# #
# [*error_log_file*] # [*error_log_file*]
# The error log file name for the virtualhost. # The error log file name for the virtualhost.
@ -121,9 +121,9 @@ class gnocchi::wsgi::apache (
$ssl_certs_dir = undef, $ssl_certs_dir = undef,
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,
$threads = 1, $threads = 1,
$priority = '10', $priority = 10,
$access_log_file = false, $access_log_file = undef,
$access_log_format = false, $access_log_format = undef,
$error_log_file = undef, $error_log_file = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,

5
spec/classes/gnocchi_wsgi_apache_spec.rb
View File

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