openstack
/
puppet-nova
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: I102a35c38f100a729ccea7c955b7e015590f2500
This commit is contained in:
Takashi Kajinami 2022-08-02 20:40:31 +09:00
parent 35066808de
commit 434f22d885
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/wsgi/apache_api.pp
View File

@ -50,7 +50,7 @@
#
# [*priority*]
# (optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (optional) The number of threads for the vhost.
@ -72,11 +72,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.
@ -129,9 +129,9 @@ class nova::wsgi::apache_api (
$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,

12
manifests/wsgi/apache_metadata.pp
View File

@ -36,7 +36,7 @@
#
# [*priority*]
# (optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (optional) The number of threads for the vhost.
@ -58,11 +58,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.
@ -115,10 +115,10 @@ class nova::wsgi::apache_metadata (
$ssl_certs_dir = undef,
$wsgi_process_display_name = undef,
$threads = 1,
$priority = '10',
$priority = 10,
$ensure_package = 'present',
$access_log_file = false,
$access_log_format = false,
$access_log_file = undef,
$access_log_format = undef,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$headers = undef,

5
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@ -18,6 +18,7 @@ describe 'nova::wsgi::apache_api' do
:bind_port => 8774,
:group => 'nova',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -31,8 +32,8 @@ describe 'nova::wsgi::apache_api' 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,
:error_log_file => nil,
)}
end

5
spec/classes/nova_wsgi_apache_metadata_spec.rb
View File

@ -16,6 +16,7 @@ describe 'nova::wsgi::apache_metadata' do
:bind_port => 8775,
:group => 'nova',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -29,8 +30,8 @@ describe 'nova::wsgi::apache_metadata' 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,
:error_log_file => nil,
)}
end