From 1694f0ce20dcea536bf1656b3a19e61aa2100fbf Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 10 Aug 2023 02:20:21 +0900
Subject: [PATCH] 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
---
 manifests/wsgi/apache_api.pp                               | 6 ++++++
 manifests/wsgi/apache_metadata.pp                          | 6 ++++++
 .../notes/wsgi-apache-setenv-61b03a6a3b894526.yaml         | 7 +++++++
 spec/classes/nova_wsgi_apache_api_spec.rb                  | 1 +
 spec/classes/nova_wsgi_apache_metadata_spec.rb             | 1 +
 5 files changed, 21 insertions(+)
 create mode 100644 releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml

diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp
index 1c9c8abb6..411f0101b 100644
--- a/manifests/wsgi/apache_api.pp
+++ b/manifests/wsgi/apache_api.pp
@@ -52,6 +52,10 @@
 #   (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
@@ -148,6 +152,7 @@ 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,
@@ -173,6 +178,7 @@ class nova::wsgi::apache_api (
     group                       => $::nova::params::group,
     path                        => $path,
     priority                    => $priority,
+    setenv                      => $setenv,
     servername                  => $servername,
     ssl                         => $ssl,
     ssl_ca                      => $ssl_ca,
diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp
index 80cc6fb86..8478decfa 100644
--- a/manifests/wsgi/apache_metadata.pp
+++ b/manifests/wsgi/apache_metadata.pp
@@ -56,6 +56,10 @@
 #   (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,6 +156,7 @@ 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,
@@ -186,6 +191,7 @@ class nova::wsgi::apache_metadata (
     group                       => $::nova::params::group,
     path                        => $path,
     priority                    => $priority,
+    setenv                      => $setenv,
     servername                  => $servername,
     ssl                         => $ssl,
     ssl_ca                      => $ssl_ca,
diff --git a/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml b/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml
new file mode 100644
index 000000000..8ca91da85
--- /dev/null
+++ b/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    The following classes now supports the new ``setenv`` parameter
+
+    - ``nova::wsgi::apache_api``
+    - ``nova::wsgi::apache_metadata``
diff --git a/spec/classes/nova_wsgi_apache_api_spec.rb b/spec/classes/nova_wsgi_apache_api_spec.rb
index 143109774..6752bca92 100644
--- a/spec/classes/nova_wsgi_apache_api_spec.rb
+++ b/spec/classes/nova_wsgi_apache_api_spec.rb
@@ -19,6 +19,7 @@ describe 'nova::wsgi::apache_api' do
         :group                       => 'nova',
         :path                        => '/',
         :priority                    => 10,
+        :setenv                      => [],
         :servername                  => 'foo.example.com',
         :ssl                         => false,
         :threads                     => 1,
diff --git a/spec/classes/nova_wsgi_apache_metadata_spec.rb b/spec/classes/nova_wsgi_apache_metadata_spec.rb
index 9ada6953a..b79a5ec3b 100644
--- a/spec/classes/nova_wsgi_apache_metadata_spec.rb
+++ b/spec/classes/nova_wsgi_apache_metadata_spec.rb
@@ -17,6 +17,7 @@ describe 'nova::wsgi::apache_metadata' do
         :group                       => 'nova',
         :path                        => '/',
         :priority                    => 10,
+        :setenv                      => [],
         :servername                  => 'foo.example.com',
         :ssl                         => false,
         :threads                     => 1,