apache: Expose setenv
The setenv option needs customization in case nova api or metadata api is run by httpd + mod_wsgi and additional config files should be loaded. Change-Id: I3b9dbaf57c739710cda91fb16ca0bc1be8d3ab5f
This commit is contained in:
parent
7025f6e5b1
commit
1694f0ce20
@ -52,6 +52,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
|
||||||
@ -148,6 +152,7 @@ class nova::wsgi::apache_api (
|
|||||||
$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,
|
||||||
@ -173,6 +178,7 @@ class nova::wsgi::apache_api (
|
|||||||
group => $::nova::params::group,
|
group => $::nova::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,
|
||||||
|
@ -56,6 +56,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
|
||||||
@ -152,6 +156,7 @@ class nova::wsgi::apache_metadata (
|
|||||||
$wsgi_process_display_name = undef,
|
$wsgi_process_display_name = undef,
|
||||||
$threads = 1,
|
$threads = 1,
|
||||||
$priority = 10,
|
$priority = 10,
|
||||||
|
$setenv = [],
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
$access_log_file = undef,
|
$access_log_file = undef,
|
||||||
$access_log_pipe = undef,
|
$access_log_pipe = undef,
|
||||||
@ -186,6 +191,7 @@ class nova::wsgi::apache_metadata (
|
|||||||
group => $::nova::params::group,
|
group => $::nova::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,7 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The following classes now supports the new ``setenv`` parameter
|
||||||
|
|
||||||
|
- ``nova::wsgi::apache_api``
|
||||||
|
- ``nova::wsgi::apache_metadata``
|
@ -19,6 +19,7 @@ describe 'nova::wsgi::apache_api' do
|
|||||||
:group => 'nova',
|
:group => 'nova',
|
||||||
:path => '/',
|
:path => '/',
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
|
:setenv => [],
|
||||||
:servername => 'foo.example.com',
|
:servername => 'foo.example.com',
|
||||||
:ssl => false,
|
:ssl => false,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
|
@ -17,6 +17,7 @@ describe 'nova::wsgi::apache_metadata' do
|
|||||||
:group => 'nova',
|
:group => 'nova',
|
||||||
:path => '/',
|
:path => '/',
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
|
:setenv => [],
|
||||||
:servername => 'foo.example.com',
|
:servername => 'foo.example.com',
|
||||||
:ssl => false,
|
:ssl => false,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user