openstack
/
puppet-ceilometer
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

Change-Id: I1a2f1a28200d362b7918a458e8f885873062e98b
This commit is contained in:
Benedikt Trefzer 2017-09-18 10:51:30 +02:00
parent b6ee08938f
commit 560b82e9ae
3 changed files with 88 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
manifests/wsgi/apache.pp
View File

@ -72,6 +72,14 @@
# (Optional) apache::vhost ssl parameters. # (Optional) apache::vhost ssl parameters.
# Default to apache::vhost 'ssl_*' defaults. # 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['ceilometer'] # requires Class['apache'] & Class['ceilometer']
@ -83,22 +91,23 @@
# class { 'ceilometer::wsgi::apache': } # class { 'ceilometer::wsgi::apache': }
# #
class ceilometer::wsgi::apache ( class ceilometer::wsgi::apache (
$servername = $::fqdn, $servername = $::fqdn,
$port = 8777, $port = 8777,
$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 ::ceilometer::deps include ::ceilometer::deps
@ -114,28 +123,29 @@ class ceilometer::wsgi::apache (
Anchor['ceilometer::install::end'] -> Class['apache'] Anchor['ceilometer::install::end'] -> Class['apache']
::openstacklib::wsgi::apache { 'ceilometer_wsgi': ::openstacklib::wsgi::apache { 'ceilometer_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => 'ceilometer', group => 'ceilometer',
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 => 'ceilometer', user => 'ceilometer',
workers => $workers, workers => $workers,
wsgi_daemon_process => 'ceilometer', wsgi_daemon_process => 'ceilometer',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'ceilometer', wsgi_process_group => 'ceilometer',
wsgi_script_dir => $::ceilometer::params::ceilometer_wsgi_script_path, wsgi_script_dir => $::ceilometer::params::ceilometer_wsgi_script_path,
wsgi_script_file => 'app', wsgi_script_file => 'app',
wsgi_script_source => $::ceilometer::params::ceilometer_wsgi_script_source, wsgi_script_source => $::ceilometer::params::ceilometer_wsgi_script_source,
custom_wsgi_process_options => $custom_wsgi_process_options,
} }
} }

4
releasenotes/notes/wsgi_process_options-6ff05b70409dc49e.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.

63
spec/classes/ceilometer_wsgi_apache_spec.rb
View File

@ -13,19 +13,20 @@ describe 'ceilometer::wsgi::apache' do
it { is_expected.to contain_class('apache::mod::wsgi') } it { is_expected.to contain_class('apache::mod::wsgi') }
it { is_expected.to contain_class('apache::mod::ssl') } it { is_expected.to contain_class('apache::mod::ssl') }
it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with( it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with(
:bind_port => 8777, :bind_port => 8777,
:group => 'ceilometer', :group => 'ceilometer',
:path => '/', :path => '/',
:servername => facts[:fqdn], :servername => facts[:fqdn],
:ssl => true, :ssl => true,
:threads => facts[:os_workers], :threads => facts[:os_workers],
:user => 'ceilometer', :user => 'ceilometer',
:workers => 1, :workers => 1,
:wsgi_daemon_process => 'ceilometer', :wsgi_daemon_process => 'ceilometer',
:wsgi_process_group => 'ceilometer', :wsgi_process_group => 'ceilometer',
: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 => {},
)} )}
end end
@ -38,6 +39,9 @@ describe 'ceilometer::wsgi::apache' do
:ssl => false, :ssl => false,
:wsgi_process_display_name => 'ceilometer', :wsgi_process_display_name => 'ceilometer',
:workers => 37, :workers => 37,
:custom_wsgi_process_options => {
'python_path' => '/my/python/path',
},
} }
end end
it { is_expected.to contain_class('ceilometer::deps') } it { is_expected.to contain_class('ceilometer::deps') }
@ -46,21 +50,24 @@ describe 'ceilometer::wsgi::apache' do
it { is_expected.to contain_class('apache::mod::wsgi') } it { is_expected.to contain_class('apache::mod::wsgi') }
it { is_expected.to_not contain_class('apache::mod::ssl') } it { is_expected.to_not contain_class('apache::mod::ssl') }
it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with( it { is_expected.to contain_openstacklib__wsgi__apache('ceilometer_wsgi').with(
:bind_host => '10.42.51.1', :bind_host => '10.42.51.1',
:bind_port => 12345, :bind_port => 12345,
:group => 'ceilometer', :group => 'ceilometer',
:path => '/', :path => '/',
:servername => 'dummy.host', :servername => 'dummy.host',
:ssl => false, :ssl => false,
:threads => facts[:os_workers], :threads => facts[:os_workers],
:user => 'ceilometer', :user => 'ceilometer',
:workers => 37, :workers => 37,
:wsgi_daemon_process => 'ceilometer', :wsgi_daemon_process => 'ceilometer',
:wsgi_process_display_name => 'ceilometer', :wsgi_process_display_name => 'ceilometer',
:wsgi_process_group => 'ceilometer', :wsgi_process_group => 'ceilometer',
: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/path',
},
)} )}
end end
end end