Merge "Expose vhost_custom_fragment"
This commit is contained in:
commit
66b976f168
@ -85,6 +85,11 @@
|
|||||||
# (optional) Name of the WSGI process display-name.
|
# (optional) Name of the WSGI process display-name.
|
||||||
# Defaults to undef
|
# 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
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -116,6 +121,8 @@ class heat::wsgi::apache_api_cfn (
|
|||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
$wsgi_process_display_name = undef,
|
$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
|
# See custom fragment below
|
||||||
@ -149,8 +156,7 @@ class heat::wsgi::apache_api_cfn (
|
|||||||
ssl_certs_dir => $ssl_certs_dir,
|
ssl_certs_dir => $ssl_certs_dir,
|
||||||
threads => $threads,
|
threads => $threads,
|
||||||
priority => $priority,
|
priority => $priority,
|
||||||
# Enforce content-type, see https://bugs.launchpad.net/tripleo/+bug/1641589
|
vhost_custom_fragment => $vhost_custom_fragment,
|
||||||
vhost_custom_fragment => 'RequestHeader set Content-Type "application/json"',
|
|
||||||
custom_wsgi_process_options => $custom_wsgi_process_options,
|
custom_wsgi_process_options => $custom_wsgi_process_options,
|
||||||
access_log_file => $access_log_file,
|
access_log_file => $access_log_file,
|
||||||
access_log_format => $access_log_format,
|
access_log_format => $access_log_format,
|
||||||
|
@ -23,7 +23,8 @@ describe 'heat::wsgi::apache_api_cfn' do
|
|||||||
:priority => 10,
|
:priority => 10,
|
||||||
:custom_wsgi_process_options => {},
|
:custom_wsgi_process_options => {},
|
||||||
:access_log_file => false,
|
:access_log_file => false,
|
||||||
:access_log_format => false,)
|
:access_log_format => false,
|
||||||
|
:vhost_custom_fragment => 'RequestHeader set Content-Type "application/json"',)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user