openstack/puppet-panko
Code Issues Proposed changes

add parameter to overwrite/add wsgi process options

Browse Source 
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

Change-Id: I9f4ca58129a21a61cffbe84ee542ab7e16d2bb19
This commit is contained in:
Benedikt Trefzer 2017-09-24 12:22:10 +02:00
parent f28ed8df08
commit b9088700f5
3 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
manifests/wsgi/apache.pp
View File

@ -67,6 +67,14 @@
# apache::vhost ssl parameters. # apache::vhost ssl parameters.
# Optional. Default to apache::vhost 'ssl_*' defaults. # 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 # == Dependencies
# #
# requires Class['apache'] & Class['panko'] # requires Class['apache'] & Class['panko']
@ -78,22 +86,23 @@
# class { 'panko::wsgi::apache': } # class { 'panko::wsgi::apache': }
# #
class panko::wsgi::apache ( class panko::wsgi::apache (
$servername = $::fqdn, $servername = $::fqdn,
$port = 8977, $port = 8977,
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = true, $ssl = true,
$workers = 1, $workers = 1,
$ssl_cert = undef, $ssl_cert = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_chain = undef, $ssl_chain = undef,
$ssl_ca = undef, $ssl_ca = undef,
$ssl_crl_path = undef, $ssl_crl_path = undef,
$ssl_crl = undef, $ssl_crl = undef,
$ssl_certs_dir = undef, $ssl_certs_dir = undef,
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,
$threads = $::os_workers, $threads = $::os_workers,
$priority = '10', $priority = '10',
$custom_wsgi_process_options = {},
) { ) {
include ::panko::deps include ::panko::deps
@ -105,28 +114,29 @@ class panko::wsgi::apache (
} }
::openstacklib::wsgi::apache { 'panko_wsgi': ::openstacklib::wsgi::apache { 'panko_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'panko', group => 'panko',
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
ssl => $ssl, ssl => $ssl,
ssl_ca => $ssl_ca, ssl_ca => $ssl_ca,
ssl_cert => $ssl_cert, ssl_cert => $ssl_cert,
ssl_certs_dir => $ssl_certs_dir, ssl_certs_dir => $ssl_certs_dir,
ssl_chain => $ssl_chain, ssl_chain => $ssl_chain,
ssl_crl => $ssl_crl, ssl_crl => $ssl_crl,
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => 'panko', user => 'panko',
workers => $workers, workers => $workers,
wsgi_daemon_process => 'panko', wsgi_daemon_process => 'panko',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'panko', wsgi_process_group => 'panko',
wsgi_script_dir => $::panko::params::panko_wsgi_script_path, wsgi_script_dir => $::panko::params::panko_wsgi_script_path,
wsgi_script_file => 'app', wsgi_script_file => 'app',
wsgi_script_source => $::panko::params::panko_wsgi_script_source, wsgi_script_source => $::panko::params::panko_wsgi_script_source,
custom_wsgi_process_options => $custom_wsgi_process_options,
} }
} }

5
releasenotes/notes/wsgi_process_options-03a80f11e4fcd30b.yaml Normal file
View File

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

6
spec/classes/panko_wsgi_apache_spec.rb
View File

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