Expose vhost_custom_fragment
It is provided by the Puppet class 'openstacklib::wsgi::apache'. This change exposes it for the Barbican service. Change-Id: I3baa7af29970b4da25ff67a54e473c32ee6ad40f Signed-off-by: Luke Short <ekultails@gmail.com>
This commit is contained in:
parent
7c934e82cc
commit
257f929622
|
@ -93,6 +93,11 @@
|
||||||
# { python-path => '/my/python/virtualenv' }
|
# { python-path => '/my/python/virtualenv' }
|
||||||
# Defaults to {}
|
# 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.
|
||||||
|
#
|
||||||
# == Authors
|
# == Authors
|
||||||
#
|
#
|
||||||
# Ade Lee <alee@redhat.com>
|
# Ade Lee <alee@redhat.com>
|
||||||
|
@ -122,6 +127,7 @@ class barbican::wsgi::apache (
|
||||||
$access_log_format = false,
|
$access_log_format = false,
|
||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
|
$vhost_custom_fragment = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include barbican::deps
|
include barbican::deps
|
||||||
|
@ -169,6 +175,7 @@ class barbican::wsgi::apache (
|
||||||
ssl_key => $ssl_key,
|
ssl_key => $ssl_key,
|
||||||
threads => $threads,
|
threads => $threads,
|
||||||
user => 'barbican',
|
user => 'barbican',
|
||||||
|
vhost_custom_fragment => $vhost_custom_fragment,
|
||||||
workers => $workers,
|
workers => $workers,
|
||||||
wsgi_daemon_process => 'barbican-api',
|
wsgi_daemon_process => 'barbican-api',
|
||||||
wsgi_process_display_name => $wsgi_process_display_name,
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
|
|
|
@ -62,6 +62,7 @@ describe 'barbican::wsgi::apache' do
|
||||||
:custom_wsgi_process_options => {
|
:custom_wsgi_process_options => {
|
||||||
'python_path' => '/my/python/path',
|
'python_path' => '/my/python/path',
|
||||||
},
|
},
|
||||||
|
:vhost_custom_fragment => 'Timeout 99',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
it { is_expected.to contain_class('barbican::params') }
|
it { is_expected.to contain_class('barbican::params') }
|
||||||
|
@ -77,6 +78,7 @@ describe 'barbican::wsgi::apache' do
|
||||||
:ssl => false,
|
:ssl => false,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:user => 'barbican',
|
:user => 'barbican',
|
||||||
|
:vhost_custom_fragment => 'Timeout 99',
|
||||||
:workers => 37,
|
:workers => 37,
|
||||||
:wsgi_daemon_process => 'barbican-api',
|
:wsgi_daemon_process => 'barbican-api',
|
||||||
:wsgi_process_display_name => 'barbican-api',
|
:wsgi_process_display_name => 'barbican-api',
|
||||||
|
|
Loading…
Reference in New Issue