openstack/puppet-aodh
Code Issues Proposed changes

Merge "Adapt to new type validation in puppetlabs-apache"

Browse Source
This commit is contained in:
Zuul 2022-08-08 19:25:54 +00:00 committed by Gerrit Code Review
commit 99307d1bf1
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*]
# (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.
@ -138,9 +138,9 @@ class aodh::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 = {},
$wsgi_script_dir = $::aodh::params::aodh_wsgi_script_dir,

5
spec/classes/aodh_wsgi_apache_spec.rb
View File

@ -9,6 +9,7 @@ describe 'aodh::wsgi::apache' do
:bind_port => 8042,
:group => 'aodh',
:path => '/',
:priority => 10,
:servername => facts[:fqdn],
:ssl => false,
:threads => 1,
@ -22,8 +23,8 @@ describe 'aodh::wsgi::apache' 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,
)}
end