openstack/puppet-cinder
Code Issues Proposed changes

Expose vhost_custom_fragment

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

Change-Id: If3f3f230aae7e04a774c967e1786561d70e43e50
Signed-off-by: Luke Short <ekultails@gmail.com>
This commit is contained in:
Luke Short 2020-08-12 14:44:40 -04:00
parent e5152016e3
commit 1fa7a69e9b
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

@ -102,6 +102,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['cinder']
@ -137,6 +142,7 @@ class cinder::wsgi::apache (
$error_log_pipe = undef,
$error_log_syslog = undef,
$custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) {
include cinder::deps
@ -164,6 +170,7 @@ class cinder::wsgi::apache (
ssl_key => $ssl_key,
threads => $threads,
user => 'cinder',
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers,
wsgi_daemon_process => 'cinder-api',
wsgi_process_display_name => $wsgi_process_display_name,

2
spec/classes/cinder_wsgi_apache_spec.rb
View File

@ -39,6 +39,7 @@ describe 'cinder::wsgi::apache' do
:bind_host => '10.42.51.1',
:port => 12345,
:ssl => false,
:vhost_custom_fragment => 'Timeout 99',
:wsgi_process_display_name => 'cinder-api',
:workers => 37,
:custom_wsgi_process_options => {
@ -59,6 +60,7 @@ describe 'cinder::wsgi::apache' do
:ssl => false,
:threads => 1,
:user => 'cinder',
:vhost_custom_fragment => 'Timeout 99',
:workers => 37,
:wsgi_daemon_process => 'cinder-api',
:wsgi_process_display_name => 'cinder-api',