openstack/puppet-heat
Code Issues Proposed changes

Merge "Expose vhost_custom_fragment"

Browse Source
This commit is contained in:
Zuul 2020-08-19 14:41:19 +00:00 committed by Gerrit Code Review
commit 66b976f168
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/wsgi/apache_api_cfn.pp
View File

@ -85,6 +85,11 @@
# (optional) Name of the WSGI process display-name.
# Defaults to undef
#
# [*vhost_custom_fragment*]
# (optional) Passes a string of custom configuration
# directives to be placed at the end of the vhost configuration.
# Default: 'RequestHeader set Content-Type "application/json"'
#
# == Dependencies
#
# requires Class['apache'] & Class['heat']
@ -116,6 +121,8 @@ class heat::wsgi::apache_api_cfn (
$error_log_file = undef,
$custom_wsgi_process_options = {},
$wsgi_process_display_name = undef,
# Enforce content-type, see https://bugs.launchpad.net/tripleo/+bug/1641589
$vhost_custom_fragment = 'RequestHeader set Content-Type "application/json"',
) {
# See custom fragment below
@ -149,8 +156,7 @@ class heat::wsgi::apache_api_cfn (
ssl_certs_dir => $ssl_certs_dir,
threads => $threads,
priority => $priority,
# Enforce content-type, see https://bugs.launchpad.net/tripleo/+bug/1641589
vhost_custom_fragment => 'RequestHeader set Content-Type "application/json"',
vhost_custom_fragment => $vhost_custom_fragment,
custom_wsgi_process_options => $custom_wsgi_process_options,
access_log_file => $access_log_file,
access_log_format => $access_log_format,

3
spec/classes/heat_wsgi_apache_api_cfn_spec.rb
View File

@ -23,7 +23,8 @@ describe 'heat::wsgi::apache_api_cfn' do
:priority => 10,
:custom_wsgi_process_options => {},
:access_log_file => false,
:access_log_format => false,)
:access_log_format => false,
:vhost_custom_fragment => 'RequestHeader set Content-Type "application/json"',)
}
end
end