openstack
/
puppet-ironic
Code Issues Proposed changes

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>
(cherry picked from commit 3f682aa5dd)
(cherry picked from commit c2c898ebaa)
This commit is contained in:
Luke Short 2020-08-11 11:03:38 -04:00
parent ee3cb9f356
commit 39f97cc368
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache.pp
View File

@ -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,

2
spec/classes/ironic_wsgi_apache_spec.rb
View File

@ -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',