openstack
/
puppet-ceilometer
Code Issues Proposed changes

Add customization for wsgi process display name 

Change-Id: I86495b73f386ff69bacd972947d702ea6861f94c
Related-Bug: #1626550
This commit is contained in:
Xing Zhou 2016-12-21 12:55:37 +08:00
parent 2025907cc5
commit 29e54fbb8d
2 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/wsgi/apache.pp
View File

@ -58,6 +58,10 @@
# (Optional) The number of threads for the vhost.
# Defaults to $::os_workers.
#
# [*wsgi_process_display_name*]
# (optional) Name of the WSGI process display-name.
# Defaults to undef
#
# [*ssl_cert*]
# [*ssl_key*]
# [*ssl_chain*]
@ -92,6 +96,7 @@ class ceilometer::wsgi::apache (
$ssl_crl_path = undef,
$ssl_crl = undef,
$ssl_certs_dir = undef,
$wsgi_process_display_name = undef,
$threads = $::os_workers,
$priority = '10',
) {
@ -123,6 +128,7 @@ class ceilometer::wsgi::apache (
user => 'ceilometer',
workers => $workers,
wsgi_daemon_process => 'ceilometer',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'ceilometer',
wsgi_script_dir => $::ceilometer::params::ceilometer_wsgi_script_path,
wsgi_script_file => 'app',

17
spec/classes/ceilometer_wsgi_apache_spec.rb
View File

@ -49,6 +49,13 @@ describe 'ceilometer::wsgi::apache' do
'docroot_group' => 'ceilometer',
'ssl' => 'true',
'wsgi_daemon_process' => 'ceilometer',
'wsgi_daemon_process_options' => {
'user' => 'ceilometer',
'group' => 'ceilometer',
'processes' => 1,
'threads' => "#{global_facts[:os_workers]}",
'display-name' => 'ceilometer_wsgi',
},
'wsgi_process_group' => 'ceilometer',
'wsgi_script_aliases' => { '/' => "#{platform_parameters[:wsgi_script_path]}/app" },
'require' => 'File[ceilometer_wsgi]'
@ -63,6 +70,7 @@ describe 'ceilometer::wsgi::apache' do
:bind_host => '10.42.51.1',
:port => 12345,
:ssl => false,
:wsgi_process_display_name => 'ceilometer',
:workers => 37,
}
end
@ -76,6 +84,13 @@ describe 'ceilometer::wsgi::apache' do
'docroot_group' => 'ceilometer',
'ssl' => 'false',
'wsgi_daemon_process' => 'ceilometer',
'wsgi_daemon_process_options' => {
'user' => 'ceilometer',
'group' => 'ceilometer',
'processes' => '37',
'threads' => "#{global_facts[:os_workers]}",
'display-name' => 'ceilometer',
},
'wsgi_process_group' => 'ceilometer',
'wsgi_script_aliases' => { '/' => "#{platform_parameters[:wsgi_script_path]}/app" },
'require' => 'File[ceilometer_wsgi]'
@ -91,6 +106,8 @@ describe 'ceilometer::wsgi::apache' do
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts({
:os_workers => 8,
:concat_basedir => '/var/lib/puppet/concat',
:fqdn => 'some.host.tld'
}))
end