From 3f682aa5dd34afaebf5599f5e1e504dd83b9f2ae Mon Sep 17 00:00:00 2001
From: Luke Short <ekultails@gmail.com>
Date: Tue, 11 Aug 2020 11:03:38 -0400
Subject: [PATCH] Expose vhost_custom_fragment

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

Change-Id: Ida7c7004db522f736bb810cbb7ac7044f19b4d20
Signed-off-by: Luke Short <ekultails@gmail.com>
---
 manifests/wsgi/apache.pp                | 7 +++++++
 spec/classes/ironic_wsgi_apache_spec.rb | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 020fbc4b..c1efcb46 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['ironic']
@@ -118,6 +123,7 @@ class ironic::wsgi::apache (
   $access_log_format           = false,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
+  $vhost_custom_fragment       = undef,
 ) {
 
   include ironic::deps
@@ -145,6 +151,7 @@ class ironic::wsgi::apache (
     ssl_key                     => $ssl_key,
     threads                     => $threads,
     user                        => 'ironic',
+    vhost_custom_fragment       => $vhost_custom_fragment,
     workers                     => $workers,
     wsgi_daemon_process         => 'ironic',
     wsgi_process_display_name   => $wsgi_process_display_name,
diff --git a/spec/classes/ironic_wsgi_apache_spec.rb b/spec/classes/ironic_wsgi_apache_spec.rb
index 579f9fa4..5b232b24 100644
--- a/spec/classes/ironic_wsgi_apache_spec.rb
+++ b/spec/classes/ironic_wsgi_apache_spec.rb
@@ -35,6 +35,7 @@ describe 'ironic::wsgi::apache' do
           :bind_host                   => '10.42.51.1',
           :port                        => 12345,
           :ssl                         => false,
+         :vhost_custom_fragment        => 'Timeout 99',
           :wsgi_process_display_name   => 'ironic',
           :workers                     => 37,
           :access_log_file             => '/var/log/httpd/access_log',
@@ -58,6 +59,7 @@ describe 'ironic::wsgi::apache' do
         :ssl                         => false,
         :threads                     => 15,
         :user                        => 'ironic',
+        :vhost_custom_fragment       => 'Timeout 99',
         :workers                     => 37,
         :wsgi_daemon_process         => 'ironic',
         :wsgi_process_display_name   => 'ironic',