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>
changes/44/746144/1
Luke Short 2 years ago
parent 7c934e82cc
commit 257f929622
  1. 7
      manifests/wsgi/apache.pp
  2. 2
      spec/classes/barbican_wsgi_apache_spec.rb

@ -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.
#
# == Authors
#
# Ade Lee <alee@redhat.com>
@ -122,6 +127,7 @@ class barbican::wsgi::apache (
$access_log_format = false,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) {
include barbican::deps
@ -169,6 +175,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…
Cancel
Save