From 293786f2a1ffd2d78c7fc263ffc44061ff135115 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 16 Aug 2023 12:26:37 +0000
Subject: [PATCH] Revert "apache: Expose setenv"

This reverts commit ee4d51197f175d03a4edd2c9af2188f5df2d8aa2.

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
---
 manifests/wsgi/apache.pp                                    | 6 ------
 releasenotes/notes/wsgi-apache-setenv-3d710d074459a9c1.yaml | 4 ----
 spec/classes/neutron_wsgi_apache_spec.rb                    | 1 -
 3 files changed, 11 deletions(-)
 delete mode 100644 releasenotes/notes/wsgi-apache-setenv-3d710d074459a9c1.yaml

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index ae277e77e..f4aba7e16 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -50,10 +50,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
@@ -143,7 +139,6 @@ class neutron::wsgi::apache (
   $wsgi_process_display_name   = undef,
   $threads                     = 1,
   $priority                    = 10,
-  $setenv                      = [],
   $access_log_file             = undef,
   $access_log_pipe             = undef,
   $access_log_syslog           = undef,
@@ -167,7 +162,6 @@ class neutron::wsgi::apache (
     group                       => $::neutron::params::group,
     path                        => $path,
     priority                    => $priority,
-    setenv                      => $setenv,
     servername                  => $servername,
     ssl                         => $ssl,
     ssl_ca                      => $ssl_ca,
diff --git a/releasenotes/notes/wsgi-apache-setenv-3d710d074459a9c1.yaml b/releasenotes/notes/wsgi-apache-setenv-3d710d074459a9c1.yaml
deleted file mode 100644
index bab7cedfa..000000000
--- a/releasenotes/notes/wsgi-apache-setenv-3d710d074459a9c1.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-features:
-  - |
-    The new ``neutron::wsgi::apache::setenv`` parameter has been added.
diff --git a/spec/classes/neutron_wsgi_apache_spec.rb b/spec/classes/neutron_wsgi_apache_spec.rb
index bab2d52cb..0a36ca2e6 100644
--- a/spec/classes/neutron_wsgi_apache_spec.rb
+++ b/spec/classes/neutron_wsgi_apache_spec.rb
@@ -9,7 +9,6 @@ describe 'neutron::wsgi::apache' do
         :group                       => 'neutron',
         :path                        => '/',
         :priority                    => 10,
-        :setenv                      => [],
         :servername                  => 'foo.example.com',
         :ssl                         => false,
         :threads                     => 1,