Expose vhost_custom_fragment
It is provided by the Puppet class 'openstacklib::wsgi::apache'. This change exposes it for the Manila service. Change-Id: Id379b9aa91d6fc53dc2a36cd5d9504458c13734b Signed-off-by: Luke Short <ekultails@gmail.com> (cherry picked from commit4fbe898164
) (cherry picked from commit93646efae9
)
This commit is contained in:
parent
e41b1b684c
commit
6c1e210e4d
|
@ -89,6 +89,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.
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['manila']
|
# requires Class['apache'] & Class['manila']
|
||||||
|
@ -121,6 +126,7 @@ class manila::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 ::manila::deps
|
include ::manila::deps
|
||||||
|
@ -148,6 +154,7 @@ class manila::wsgi::apache (
|
||||||
ssl_key => $ssl_key,
|
ssl_key => $ssl_key,
|
||||||
threads => $threads,
|
threads => $threads,
|
||||||
user => 'manila',
|
user => 'manila',
|
||||||
|
vhost_custom_fragment => $vhost_custom_fragment,
|
||||||
workers => $workers,
|
workers => $workers,
|
||||||
wsgi_daemon_process => 'manila-api',
|
wsgi_daemon_process => 'manila-api',
|
||||||
wsgi_process_display_name => $wsgi_process_display_name,
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
|
@ -161,4 +168,4 @@ class manila::wsgi::apache (
|
||||||
error_log_file => $error_log_file,
|
error_log_file => $error_log_file,
|
||||||
require => Anchor['manila::install::end'],
|
require => Anchor['manila::install::end'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,8 @@ describe 'manila::wsgi::apache' do
|
||||||
},
|
},
|
||||||
:access_log_file => '/var/log/httpd/access_log',
|
:access_log_file => '/var/log/httpd/access_log',
|
||||||
:access_log_format => 'some format',
|
:access_log_format => 'some format',
|
||||||
:error_log_file => '/var/log/httpd/error_log'
|
:error_log_file => '/var/log/httpd/error_log',
|
||||||
|
:vhost_custom_fragment => 'Timeout 99'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
it { is_expected.to contain_class('manila::params') }
|
it { is_expected.to contain_class('manila::params') }
|
||||||
|
@ -58,6 +59,7 @@ describe 'manila::wsgi::apache' do
|
||||||
:ssl => false,
|
:ssl => false,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:user => 'manila',
|
:user => 'manila',
|
||||||
|
:vhost_custom_fragment => 'Timeout 99',
|
||||||
:workers => 37,
|
:workers => 37,
|
||||||
:wsgi_daemon_process => 'manila-api',
|
:wsgi_daemon_process => 'manila-api',
|
||||||
:wsgi_process_display_name => 'manila-api',
|
:wsgi_process_display_name => 'manila-api',
|
||||||
|
|
Loading…
Reference in New Issue