Expose vhost_custom_fragment
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> (cherry picked from commit1fa7a69e9b
) (cherry picked from commit61e773f49c
) (cherry picked from commitff571a93c7
)
This commit is contained in:
parent
f6e5161f3b
commit
a95a91b4ed
|
@ -86,6 +86,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']
|
||||
|
@ -117,6 +122,7 @@ class cinder::wsgi::apache (
|
|||
$access_log_format = false,
|
||||
$error_log_file = undef,
|
||||
$custom_wsgi_process_options = {},
|
||||
$vhost_custom_fragment = undef,
|
||||
) {
|
||||
|
||||
include ::cinder::deps
|
||||
|
@ -144,6 +150,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,
|
||||
|
|
|
@ -34,6 +34,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 => {
|
||||
|
@ -57,6 +58,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',
|
||||
|
|
Loading…
Reference in New Issue