openstack
/
puppet-mistral
Code Issues Proposed changes

Expose vhost_custom_fragment 

It is provided by the Puppet class 'openstacklib::wsgi::apache'.
This change exposes it for the Mistral service.

Change-Id: I574c8233e15240074e67520b30df9cca79a9c20b
Signed-off-by: Luke Short <ekultails@gmail.com>
This commit is contained in:
Luke Short 2020-08-11 10:42:37 -04:00
parent 10f341af44
commit 82cd962e78
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache.pp
View File

@ -90,6 +90,11 @@
# { python-path => '/my/python/virtualenv' }
# Defaults to {}
#
# [*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
#
# requires Class['apache'] & Class['mistral']
@ -121,6 +126,7 @@ class mistral::wsgi::apache (
$access_log_format = false,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) {
include mistral::deps
@ -179,5 +185,6 @@ class mistral::wsgi::apache (
access_log_format => $access_log_format,
error_log_file => $error_log_file,
custom_wsgi_process_options => $custom_wsgi_process_options,
vhost_custom_fragment => $vhost_custom_fragment,
}
}

2
spec/classes/mistral_wsgi_apache_spec.rb
View File

@ -44,6 +44,7 @@ describe 'mistral::wsgi::apache' do
:custom_wsgi_process_options => {
'python_path' => '/my/python/path',
},
:vhost_custom_fragment => 'Timeout 99',
}
end
it { is_expected.to contain_class('mistral::deps') }
@ -60,6 +61,7 @@ describe 'mistral::wsgi::apache' do
:ssl => false,
:threads => 1,
:user => 'mistral',
:vhost_custom_fragment => 'Timeout 99',
:workers => 37,
:wsgi_daemon_process => 'mistral',
:wsgi_process_display_name => 'mistral',