openstack
/
puppet-horizon
Code Issues Proposed changes

Fix type validation error with puppetlabs-apache 8.0.0 

This is follow-up of 3ae8f91ca4 and fixes
type validation error of apache::vhost::access_log_format, which no
longer accepts a boolean value.

Related-Bug: #1983300
Change-Id: Ic5bcbcd94bfe74b0ff7ea750780021daa772a196
This commit is contained in:
Takashi Kajinami 2022-08-15 02:31:28 +09:00
parent 65ed3e0422
commit 14b45e9987
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -362,7 +362,7 @@
#
# [*access_log_format*]
# (optional) The log format for the access log.
# Defaults to false
# Defaults to undef
#
# [*session_timeout*]
# (optional) The session timeout for horizon in seconds. After this many seconds of inactivity
@ -620,7 +620,7 @@ class horizon(
$overview_days_range = undef,
$root_url = $::horizon::params::root_url,
$root_path = "${::horizon::params::static_path}/openstack-dashboard",
$access_log_format = false,
$access_log_format = undef,
$session_timeout = 1800,
$timezone = 'UTC',
$secure_cookies = false,

4
manifests/wsgi/apache.pp
View File

@ -99,7 +99,7 @@
#
# [*access_log_format*]
# (optional) The log format to use to the access log.
# Defaults to false
# Defaults to undef
#
# [*access_log_file*]
# (optional) The log file name for the virtualhost.
@ -140,7 +140,7 @@ class horizon::wsgi::apache (
$redirect_type = 'permanent',
$root_url = $::horizon::params::root_url,
$root_path = "${::horizon::params::static_path}/openstack-dashboard",
$access_log_format = false,
$access_log_format = undef,
$access_log_file = 'horizon_access.log',
$error_log_file = 'horizon_error.log',
$ssl_access_log_file = 'horizon_ssl_access.log',

13
spec/classes/horizon_init_spec.rb
View File

@ -43,13 +43,12 @@ describe 'horizon' do
it 'configures apache' do
is_expected.to contain_class('horizon::wsgi::apache').with({
:servername => 'some.host.tld',
:listen_ssl => false,
:wsgi_processes => facts[:os_workers],
:wsgi_threads => '1',
:extra_params => {},
:redirect_type => 'permanent',
:access_log_format => false,
:servername => 'some.host.tld',
:listen_ssl => false,
:wsgi_processes => facts[:os_workers],
:wsgi_threads => '1',
:extra_params => {},
:redirect_type => 'permanent',
})
end

3
spec/classes/horizon_wsgi_apache_spec.rb
View File

@ -28,7 +28,6 @@ describe 'horizon::wsgi::apache' do
it { should contain_apache__vhost('horizon_vhost').with(
:servername => 'some.host.tld',
:access_log_file => 'horizon_access.log',
:access_log_format => false,
:error_log_file => 'horizon_error.log',
:priority => 15,
:serveraliases => ['some.host.tld'],
@ -136,7 +135,6 @@ describe 'horizon::wsgi::apache' do
it { should contain_apache__vhost('horizon_ssl_vhost').with(
:servername => 'some.host.tld',
:access_log_file => 'horizon_ssl_access.log',
:access_log_format => false,
:error_log_file => 'horizon_ssl_error.log',
:priority => 15,
:serveraliases => ['some.host.tld'],
@ -168,7 +166,6 @@ describe 'horizon::wsgi::apache' do
it { should contain_apache__vhost('horizon_vhost').with(
:servername => 'some.host.tld',
:access_log_file => 'horizon_access.log',
:access_log_format => false,
:error_log_file => 'horizon_error.log',
:priority => 15,
:serveraliases => ['some.host.tld'],