Revert "apache: Expose setenv"

This reverts commit 1694f0ce20.

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: I9f41273654693c57798c4a34fbc1fe7b535a9ff4
This commit is contained in:
Takashi Kajinami
2023-08-16 12:26:20 +00:00
parent 1694f0ce20
commit 3724ee989c
5 changed files with 0 additions and 21 deletions

View File

@@ -52,10 +52,6 @@
# (Optional) The priority for the vhost.
# Defaults to 10
#
# [*setenv*]
# (Optional) Set environment variables for the vhost.
# Defaults to []
#
# [*threads*]
# (Optional) The number of threads for the vhost.
# Defaults to 1
@@ -152,7 +148,6 @@ class nova::wsgi::apache_api (
$wsgi_process_display_name = undef,
$threads = 1,
$priority = 10,
$setenv = [],
$access_log_file = undef,
$access_log_pipe = undef,
$access_log_syslog = undef,
@@ -178,7 +173,6 @@ class nova::wsgi::apache_api (
group => $::nova::params::group,
path => $path,
priority => $priority,
setenv => $setenv,
servername => $servername,
ssl => $ssl,
ssl_ca => $ssl_ca,

View File

@@ -56,10 +56,6 @@
# (Optional) The priority for the vhost.
# Defaults to 10
#
# [*setenv*]
# (Optional) Set environment variables for the vhost.
# Defaults to []
#
# [*threads*]
# (Optional) The number of threads for the vhost.
# Defaults to 1
@@ -156,7 +152,6 @@ class nova::wsgi::apache_metadata (
$wsgi_process_display_name = undef,
$threads = 1,
$priority = 10,
$setenv = [],
$ensure_package = 'present',
$access_log_file = undef,
$access_log_pipe = undef,
@@ -191,7 +186,6 @@ class nova::wsgi::apache_metadata (
group => $::nova::params::group,
path => $path,
priority => $priority,
setenv => $setenv,
servername => $servername,
ssl => $ssl,
ssl_ca => $ssl_ca,

View File

@@ -1,7 +0,0 @@
---
features:
- |
The following classes now supports the new ``setenv`` parameter
- ``nova::wsgi::apache_api``
- ``nova::wsgi::apache_metadata``

View File

@@ -19,7 +19,6 @@ describe 'nova::wsgi::apache_api' do
:group => 'nova',
:path => '/',
:priority => 10,
:setenv => [],
:servername => 'foo.example.com',
:ssl => false,
:threads => 1,

View File

@@ -17,7 +17,6 @@ describe 'nova::wsgi::apache_metadata' do
:group => 'nova',
:path => '/',
:priority => 10,
:setenv => [],
:servername => 'foo.example.com',
:ssl => false,
:threads => 1,