Expose vhost_custom_fragment
It is provided by the Puppet class 'openstacklib::wsgi::apache'. This change exposes it for the Barbican service. Conflicts: manifests/wsgi/apache.pp Change-Id: I3baa7af29970b4da25ff67a54e473c32ee6ad40f Signed-off-by: Luke Short <ekultails@gmail.com> (cherry picked from commit257f929622
) (cherry picked from commit288dced2d3
)
This commit is contained in:
parent
aa6afa0124
commit
da146d5387
|
@ -93,6 +93,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['barbican']
|
||||
|
@ -132,6 +137,7 @@ class barbican::wsgi::apache (
|
|||
$access_log_format = false,
|
||||
$error_log_file = undef,
|
||||
$custom_wsgi_process_options = {},
|
||||
$vhost_custom_fragment = undef,
|
||||
) {
|
||||
|
||||
include ::barbican::deps
|
||||
|
@ -179,6 +185,7 @@ class barbican::wsgi::apache (
|
|||
ssl_key => $ssl_key,
|
||||
threads => $threads,
|
||||
user => 'barbican',
|
||||
vhost_custom_fragment => $vhost_custom_fragment,
|
||||
workers => $workers,
|
||||
wsgi_daemon_process => 'barbican-api',
|
||||
wsgi_process_display_name => $wsgi_process_display_name,
|
||||
|
|
|
@ -62,6 +62,7 @@ describe 'barbican::wsgi::apache' do
|
|||
:custom_wsgi_process_options => {
|
||||
'python_path' => '/my/python/path',
|
||||
},
|
||||
:vhost_custom_fragment => 'Timeout 99',
|
||||
}
|
||||
end
|
||||
it { is_expected.to contain_class('barbican::params') }
|
||||
|
@ -77,6 +78,7 @@ describe 'barbican::wsgi::apache' do
|
|||
:ssl => false,
|
||||
:threads => 1,
|
||||
:user => 'barbican',
|
||||
:vhost_custom_fragment => 'Timeout 99',
|
||||
:workers => 37,
|
||||
:wsgi_daemon_process => 'barbican-api',
|
||||
:wsgi_process_display_name => 'barbican-api',
|
||||
|
|
Loading…
Reference in New Issue