openstack
/
puppet-neutron
Code Issues Proposed changes

add parameter to overwrite/add wsgi process options 

Add parameter to apache_wsgi to allow overwrite
and/or add additional wsgi process options.

This possibility was added to openstacklib
with Change-Id: I41914ce3361988d5db1695f09d21209772fdf548
lease enter the commit message for your changes. Lines starting

Change-Id: I8b816cbe861ba315018505973dfbb72088bc9b2a
This commit is contained in:
Benedikt Trefzer 2017-09-18 11:22:33 +02:00
parent 1a8b6e1816
commit c1465f8fa6
3 changed files with 88 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/wsgi/apache.pp
View File

@ -68,6 +68,14 @@
# apache::vhost ssl parameters.
# Optional. Default to apache::vhost 'ssl_*' defaults.
#
# [*custom_wsgi_process_options*]
# (optional) gives you the oportunity to add custom process options or to
# overwrite the default options for the WSGI main process.
# eg. to use a virtual python environment for the WSGI process
# you could set it to:
# { python-path => '/my/python/virtualenv' }
# Defaults to {}
#
# == Dependencies
#
# requires Class['apache'] & Class['neutron']
@ -95,6 +103,7 @@ class neutron::wsgi::apache (
$wsgi_process_display_name = undef,
$threads = 1,
$priority = '10',
$custom_wsgi_process_options = {},
) {
include ::neutron::deps
@ -149,5 +158,6 @@ class neutron::wsgi::apache (
wsgi_script_dir => $::neutron::params::neutron_wsgi_script_path,
wsgi_script_file => 'app',
wsgi_script_source => $::neutron::params::neutron_wsgi_script_source,
custom_wsgi_process_options => $custom_wsgi_process_options,
}
}

4
releasenotes/notes/wsgi_process_options-b1861c6dbc1d9d23.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add parameter to apacher_wsgi to allow overwrite
and/or add additional wsgi process options.

7
spec/classes/neutron_wsgi_apache_spec.rb
View File

@ -22,6 +22,7 @@ describe 'neutron::wsgi::apache' do
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source],
:custom_wsgi_process_options => {},
)}
end
@ -34,6 +35,9 @@ describe 'neutron::wsgi::apache' do
:ssl => false,
:wsgi_process_display_name => 'neutron',
:workers => 37,
:custom_wsgi_process_options => {
'python_path' => '/my/python/path',
},
}
end
it { is_expected.to contain_class('neutron::params') }
@ -56,6 +60,9 @@ describe 'neutron::wsgi::apache' do
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',
:wsgi_script_source => platform_params[:wsgi_script_source],
:custom_wsgi_process_options => {
'python_path' => '/my/python/path',
},
)}
end
end