apache: Expose setenv
The setenv option needs customization in case neutron api is run by httpd + mod_wsgi and additional config files should be loaded. Change-Id: I3880954896917dde0e13f69685a560db8589ec0e
This commit is contained in:
parent
45aeee8f0b
commit
ee4d51197f
@ -50,6 +50,10 @@
|
|||||||
# (optional) The priority for the vhost.
|
# (optional) The priority for the vhost.
|
||||||
# Defaults to 10
|
# Defaults to 10
|
||||||
#
|
#
|
||||||
|
# [*setenv*]
|
||||||
|
# (optional) Set environment variables for the vhost.
|
||||||
|
# Defaults to []
|
||||||
|
#
|
||||||
# [*threads*]
|
# [*threads*]
|
||||||
# (optional) The number of threads for the vhost.
|
# (optional) The number of threads for the vhost.
|
||||||
# Defaults to 1
|
# Defaults to 1
|
||||||
@ -139,6 +143,7 @@ class neutron::wsgi::apache (
|
|||||||
$wsgi_process_display_name = undef,
|
$wsgi_process_display_name = undef,
|
||||||
$threads = 1,
|
$threads = 1,
|
||||||
$priority = 10,
|
$priority = 10,
|
||||||
|
$setenv = [],
|
||||||
$access_log_file = undef,
|
$access_log_file = undef,
|
||||||
$access_log_pipe = undef,
|
$access_log_pipe = undef,
|
||||||
$access_log_syslog = undef,
|
$access_log_syslog = undef,
|
||||||
@ -162,6 +167,7 @@ class neutron::wsgi::apache (
|
|||||||
group => $::neutron::params::group,
|
group => $::neutron::params::group,
|
||||||
path => $path,
|
path => $path,
|
||||||
priority => $priority,
|
priority => $priority,
|
||||||
|
setenv => $setenv,
|
||||||
servername => $servername,
|
servername => $servername,
|
||||||
ssl => $ssl,
|
ssl => $ssl,
|
||||||
ssl_ca => $ssl_ca,
|
ssl_ca => $ssl_ca,
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``neutron::wsgi::apache::setenv`` parameter has been added.
|
@ -9,6 +9,7 @@ describe 'neutron::wsgi::apache' do
|
|||||||
:group => 'neutron',
|
:group => 'neutron',
|
||||||
:path => '/',
|
:path => '/',
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
|
:setenv => [],
|
||||||
:servername => 'foo.example.com',
|
:servername => 'foo.example.com',
|
||||||
:ssl => false,
|
:ssl => false,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
|
Loading…
Reference in New Issue
Block a user