openstack
/
puppet-aodh
Code Issues Proposed changes

Merge "Expose vhost_custom_fragment"

This commit is contained in:
Zuul 2020-08-06 22:04:49 +00:00 committed by Gerrit Code Review
parent 895c8b4037 40c6462da5
commit b592c1d0dd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache.pp
View File

@ -98,6 +98,11 @@
# (optional) The location of the aodh WSGI script
# Optional. Defaults to $::aodh::params::aodh_wsgi_script_source
#
# [*vhost_custom_fragment*]
# (optional) Passes a string of custom configuration
# directives to be placed at the end of the vhost configuration.
# Defaults to undef.
#
#
# == Dependencies
#
@ -132,6 +137,7 @@ class aodh::wsgi::apache (
$custom_wsgi_process_options = {},
$wsgi_script_dir = undef,
$wsgi_script_source = undef,
$vhost_custom_fragment = undef,
) {
include aodh::deps
@ -166,6 +172,7 @@ class aodh::wsgi::apache (
ssl_key => $ssl_key,
threads => $threads,
user => 'aodh',
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers,
wsgi_daemon_process => 'aodh',
wsgi_process_display_name => $wsgi_process_display_name,

4
spec/classes/aodh_wsgi_apache_spec.rb
View File

@ -44,7 +44,8 @@ describe 'aodh::wsgi::apache' do
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log',
:wsgi_script_dir => '/var/lib/openstack/cgi-bin/aodh',
:wsgi_script_source => '/my/path/app.wsgi'
:wsgi_script_source => '/my/path/app.wsgi',
:vhost_custom_fragment => 'Timeout 99'
}
end
it { is_expected.to contain_class('aodh::params') }
@ -61,6 +62,7 @@ describe 'aodh::wsgi::apache' do
:threads => 1,
:user => 'aodh',
:workers => 37,
:vhost_custom_fragment => 'Timeout 99',
:wsgi_daemon_process => 'aodh',
:wsgi_process_display_name => 'aodh',
:wsgi_process_group => 'aodh',