openstack
/
puppet-heat
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: I2df44be85cb73144ce45b8f5bea2ccba64d0be86
This commit is contained in:
Takashi Kajinami 2022-07-30 22:21:04 +09:00
parent 73c888a69b
commit 1516806fc5
5 changed files with 22 additions and 22 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.
@ -68,11 +68,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 undef.
# #
# [*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 undef.
# #
# [*error_log_file*] # [*error_log_file*]
# The error log file name for the virtualhost. # The error log file name for the virtualhost.
@ -126,9 +126,9 @@ define heat::wsgi::apache (
$ssl_crl = undef, $ssl_crl = undef,
$ssl_certs_dir = undef, $ssl_certs_dir = 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 = {},
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,

12
manifests/wsgi/apache_api.pp
View File

@ -45,7 +45,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.
@ -63,11 +63,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 undef.
# #
# [*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 undef.
# #
# [*error_log_file*] # [*error_log_file*]
# The error log file name for the virtualhost. # The error log file name for the virtualhost.
@ -122,9 +122,9 @@ class heat::wsgi::apache_api (
$ssl_crl = undef, $ssl_crl = undef,
$ssl_certs_dir = undef, $ssl_certs_dir = 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 = {},
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,

12
manifests/wsgi/apache_api_cfn.pp
View File

@ -45,7 +45,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.
@ -63,11 +63,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 undef.
# #
# [*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 undef.
# #
# [*error_log_file*] # [*error_log_file*]
# The error log file name for the virtualhost. # The error log file name for the virtualhost.
@ -123,9 +123,9 @@ class heat::wsgi::apache_api_cfn (
$ssl_crl = undef, $ssl_crl = undef,
$ssl_certs_dir = undef, $ssl_certs_dir = 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 = {},
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,

4
spec/classes/heat_wsgi_apache_api_cfn_spec.rb
View File

@ -25,8 +25,8 @@ describe 'heat::wsgi::apache_api_cfn' do
:headers => nil, :headers => nil,
:request_headers => ['set Content-Type "application/json"'], :request_headers => ['set Content-Type "application/json"'],
: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
end end

4
spec/classes/heat_wsgi_apache_api_spec.rb
View File

@ -25,8 +25,8 @@ describe 'heat::wsgi::apache_api' do
:headers => nil, :headers => nil,
:request_headers => nil, :request_headers => nil,
: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
end end