Add vhost_custom_fragment option to wsgi/apache_api
Change-Id: I7da55899b9108daced7adb8f82bdb58fcf97aa09
This commit is contained in:
parent
01e6e6681b
commit
9fce8d211e
@ -85,6 +85,10 @@
|
|||||||
# (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) Additional vhost configuration, if applicable.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -116,6 +120,7 @@ class heat::wsgi::apache_api (
|
|||||||
$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,
|
||||||
|
$vhost_custom_fragment = undef,
|
||||||
) {
|
) {
|
||||||
heat::wsgi::apache { 'api':
|
heat::wsgi::apache { 'api':
|
||||||
port => $port,
|
port => $port,
|
||||||
@ -138,5 +143,6 @@ class heat::wsgi::apache_api (
|
|||||||
access_log_format => $access_log_format,
|
access_log_format => $access_log_format,
|
||||||
error_log_file => $error_log_file,
|
error_log_file => $error_log_file,
|
||||||
wsgi_process_display_name => $wsgi_process_display_name,
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
|
vhost_custom_fragment => $vhost_custom_fragment,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
vhost_custom_fragment was added to heat::wsgi::apache_api so one can
|
||||||
|
configure custom fragments for the Heat API vhost.
|
@ -19,6 +19,7 @@ describe 'heat::wsgi::apache_api' do
|
|||||||
:ssl_crl_path => nil,
|
:ssl_crl_path => nil,
|
||||||
:ssl_certs_dir => nil,
|
:ssl_certs_dir => nil,
|
||||||
:wsgi_process_display_name => nil,
|
:wsgi_process_display_name => nil,
|
||||||
|
:vhost_custom_fragment => nil,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
:custom_wsgi_process_options => {},
|
:custom_wsgi_process_options => {},
|
||||||
|
Loading…
Reference in New Issue
Block a user