openstack
/
puppet-horizon
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2022-08-11 18:31:10 +00:00 committed by Gerrit Code Review
parent 59a265a7e3 3ae8f91ca4
commit 50980b9a1d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/wsgi/apache.pp
View File

@ -61,7 +61,7 @@
#
# [*priority*]
# (optional) The apache vhost priority.
# Defaults to '15'. To set Horizon as the primary vhost, change to '10'.
# Defaults to 15. To set Horizon as the primary vhost, change to 10.
#
# [*vhost_conf_name*]
# (Optional) Description
@ -132,7 +132,7 @@ class horizon::wsgi::apache (
$wsgi_processes = $::os_workers,
$wsgi_threads = '1',
$custom_wsgi_process_options = {},
$priority = '15',
$priority = 15,
$vhost_conf_name = 'horizon_vhost',
$vhost_ssl_conf_name = 'horizon_ssl_vhost',
$extra_params = {},

8
spec/classes/horizon_wsgi_apache_spec.rb
View File

@ -30,7 +30,7 @@ describe 'horizon::wsgi::apache' do
:access_log_file => 'horizon_access.log',
:access_log_format => false,
:error_log_file => 'horizon_error.log',
:priority => '15',
:priority => 15,
:serveraliases => ['some.host.tld'],
:docroot => '/var/www/',
:ssl => 'false',
@ -55,7 +55,7 @@ describe 'horizon::wsgi::apache' do
context 'with overridden parameters' do
before do
params.merge!({
:priority => '10',
:priority => 10,
:redirect_type => 'temp',
:wsgi_processes => '13',
:wsgi_threads => '3',
@ -138,7 +138,7 @@ describe 'horizon::wsgi::apache' do
:access_log_file => 'horizon_ssl_access.log',
:access_log_format => false,
:error_log_file => 'horizon_ssl_error.log',
:priority => '15',
:priority => 15,
:serveraliases => ['some.host.tld'],
:docroot => '/var/www/',
:ssl => 'true',
@ -170,7 +170,7 @@ describe 'horizon::wsgi::apache' do
:access_log_file => 'horizon_access.log',
:access_log_format => false,
:error_log_file => 'horizon_error.log',
:priority => '15',
:priority => 15,
:serveraliases => ['some.host.tld'],
:docroot => '/var/www/',
:ssl => 'false',