From a95a91b4ed026837e1f0b6137a15f1d6b4bc937f Mon Sep 17 00:00:00 2001
From: Luke Short <ekultails@gmail.com>
Date: Wed, 12 Aug 2020 14:44:40 -0400
Subject: [PATCH] Expose vhost_custom_fragment

It is provided by the Puppet class 'openstacklib::wsgi::apache'.
This change exposes it for the Cinder service.

Change-Id: If3f3f230aae7e04a774c967e1786561d70e43e50
Signed-off-by: Luke Short <ekultails@gmail.com>
(cherry picked from commit 1fa7a69e9b9300c1c228f872ba3e37f0210f17dd)
(cherry picked from commit 61e773f49c7e5265b0e26290e43ba61b11649404)
(cherry picked from commit ff571a93c796af5af2f8b6779db7d071d65d4e2f)
---
 manifests/wsgi/apache.pp                | 7 +++++++
 spec/classes/cinder_wsgi_apache_spec.rb | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 4396c88f..db532faf 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -86,6 +86,11 @@
 #     { python-path => '/my/python/virtualenv' }
 #     Defaults to {}
 #
+#   [*vhost_custom_fragment*]
+#     (optional) Passes a string of custom configuration
+#     directives to be placed at the end of the vhost configuration.
+#     Defaults to undef.
+#
 # == Dependencies
 #
 #   requires Class['apache'] & Class['cinder']
@@ -117,6 +122,7 @@ class cinder::wsgi::apache (
   $access_log_format           = false,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
+  $vhost_custom_fragment       = undef,
 ) {
 
   include ::cinder::deps
@@ -144,6 +150,7 @@ class cinder::wsgi::apache (
     ssl_key                     => $ssl_key,
     threads                     => $threads,
     user                        => 'cinder',
+    vhost_custom_fragment       => $vhost_custom_fragment,
     workers                     => $workers,
     wsgi_daemon_process         => 'cinder-api',
     wsgi_process_display_name   => $wsgi_process_display_name,
diff --git a/spec/classes/cinder_wsgi_apache_spec.rb b/spec/classes/cinder_wsgi_apache_spec.rb
index d9dba259..d82e38ec 100644
--- a/spec/classes/cinder_wsgi_apache_spec.rb
+++ b/spec/classes/cinder_wsgi_apache_spec.rb
@@ -34,6 +34,7 @@ describe 'cinder::wsgi::apache' do
           :bind_host                   => '10.42.51.1',
           :port                        => 12345,
           :ssl                         => false,
+          :vhost_custom_fragment       => 'Timeout 99',
           :wsgi_process_display_name   => 'cinder-api',
           :workers                     => 37,
           :custom_wsgi_process_options => {
@@ -57,6 +58,7 @@ describe 'cinder::wsgi::apache' do
         :ssl                       => false,
         :threads                   => 1,
         :user                      => 'cinder',
+        :vhost_custom_fragment     => 'Timeout 99',
         :workers                   => 37,
         :wsgi_daemon_process       => 'cinder-api',
         :wsgi_process_display_name => 'cinder-api',