openstack
/
puppet-octavia
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2022-08-12 08:40:55 +00:00 committed by Gerrit Code Review
parent 1cfb572bf2 e475e44add
commit b2ae91563a
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

@ -47,7 +47,7 @@
#
# [*priority*]
# (Optional) The priority for the vhost.
# Defaults to '10'
# Defaults to 10
#
# [*threads*]
# (Optional) The number of threads for the vhost.
@ -69,11 +69,11 @@
#
# [*access_log_file*]
# (Optional) The log file name for the virtualhost.
# Defaults to false
# Defaults to undef
#
# [*access_log_format*]
# (Optional) The log format for the virtualhost.
# Defaults to false
# Defaults to undef
#
# [*error_log_file*]
# (Optional) The error log file name for the virtualhost.
@ -129,9 +129,9 @@ class octavia::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 = $::octavia::params::octavia_wsgi_script_path,

5
spec/classes/octavia_wsgi_apache_spec.rb
View File

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