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

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

Signed-off-by: Luke Short <ekultails@gmail.com>
Change-Id: Ic5055279770342d244ef3a4592067351981b459a
---
 manifests/wsgi/apache.pp              | 7 +++++++
 spec/classes/aodh_wsgi_apache_spec.rb | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index cbeee44a..a786ef23 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -98,6 +98,11 @@
 #     (optional) The location of the aodh WSGI script
 #     Optional. Defaults to $::aodh::params::aodh_wsgi_script_source
 #
+#   [*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
 #
@@ -132,6 +137,7 @@ class aodh::wsgi::apache (
   $custom_wsgi_process_options = {},
   $wsgi_script_dir             = undef,
   $wsgi_script_source          = undef,
+  $vhost_custom_fragment       = undef,
 ) {
 
   include aodh::deps
@@ -166,6 +172,7 @@ class aodh::wsgi::apache (
     ssl_key                     => $ssl_key,
     threads                     => $threads,
     user                        => 'aodh',
+    vhost_custom_fragment       => $vhost_custom_fragment,
     workers                     => $workers,
     wsgi_daemon_process         => 'aodh',
     wsgi_process_display_name   => $wsgi_process_display_name,
diff --git a/spec/classes/aodh_wsgi_apache_spec.rb b/spec/classes/aodh_wsgi_apache_spec.rb
index 13a8305f..7ebb9d4d 100644
--- a/spec/classes/aodh_wsgi_apache_spec.rb
+++ b/spec/classes/aodh_wsgi_apache_spec.rb
@@ -44,7 +44,8 @@ describe 'aodh::wsgi::apache' do
           :access_log_format           => 'some format',
           :error_log_file              => '/var/log/httpd/error_log',
           :wsgi_script_dir             => '/var/lib/openstack/cgi-bin/aodh',
-          :wsgi_script_source          => '/my/path/app.wsgi'
+          :wsgi_script_source          => '/my/path/app.wsgi',
+          :vhost_custom_fragment       => 'Timeout 99'
         }
       end
       it { is_expected.to contain_class('aodh::params') }
@@ -61,6 +62,7 @@ describe 'aodh::wsgi::apache' do
         :threads                   => 1,
         :user                      => 'aodh',
         :workers                   => 37,
+        :vhost_custom_fragment     => 'Timeout 99',
         :wsgi_daemon_process       => 'aodh',
         :wsgi_process_display_name => 'aodh',
         :wsgi_process_group        => 'aodh',