Browse Source

Expose vhost_custom_fragment

It is provided by the Puppet class 'openstacklib::wsgi::apache'.
This change exposes it for the Cinder service.

Change-Id: If3f3f230aae7e04a774c967e1786561d70e43e50
Signed-off-by: Luke Short <ekultails@gmail.com>
(cherry picked from commit 1fa7a69e9b)
(cherry picked from commit 61e773f49c)
(cherry picked from commit ff571a93c7)
(cherry picked from commit a95a91b4ed)
(cherry picked from commit a633d3a5b0)
changes/39/792839/1
Luke Short 10 months ago
committed by Alan Bishop
parent
commit
a1e07150da
2 changed files with 9 additions and 0 deletions
  1. +7
    -0
      manifests/wsgi/apache.pp
  2. +2
    -0
      spec/classes/cinder_wsgi_apache_spec.rb

+ 7
- 0
manifests/wsgi/apache.pp View File

@ -86,6 +86,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['cinder']
@ -117,6 +122,7 @@ class cinder::wsgi::apache (
$access_log_format = false,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) {
include ::cinder::deps
@ -144,6 +150,7 @@ class cinder::wsgi::apache (
ssl_key => $ssl_key,
threads => $threads,
user => 'cinder',
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers,
wsgi_daemon_process => 'cinder-api',
wsgi_process_display_name => $wsgi_process_display_name,


+ 2
- 0
spec/classes/cinder_wsgi_apache_spec.rb View File

@ -35,6 +35,7 @@ describe 'cinder::wsgi::apache' do
:bind_host => '10.42.51.1',
:port => 12345,
:ssl => false,
:vhost_custom_fragment => 'Timeout 99',
:wsgi_process_display_name => 'cinder-api',
:workers => 37,
:custom_wsgi_process_options => {
@ -58,6 +59,7 @@ describe 'cinder::wsgi::apache' do
:ssl => false,
:threads => 1,
:user => 'cinder',
:vhost_custom_fragment => 'Timeout 99',
:workers => 37,
:wsgi_daemon_process => 'cinder-api',
:wsgi_process_display_name => 'cinder-api',


Loading…
Cancel
Save