Revert "apache: Expose setenv"
This reverts commit ee4d51197f
.
Reason for revert:
It later turned out that setenv does not override os.environ in wsgi
applications and this option can't be used to customize the environment
variable as intended. Let's revert the change to keep the interface
as much simple as possible instead of keeping the useless option.
Change-Id: Ic057a86a67d819e49ff2965bc3387fd63a8e76a4
This commit is contained in:
parent
ee4d51197f
commit
293786f2a1
@ -50,10 +50,6 @@
|
|||||||
# (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
|
||||||
@ -143,7 +139,6 @@ 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,
|
||||||
@ -167,7 +162,6 @@ 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,
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
---
|
|
||||||
features:
|
|
||||||
- |
|
|
||||||
The new ``neutron::wsgi::apache::setenv`` parameter has been added.
|
|
@ -9,7 +9,6 @@ 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