openstack/puppet-barbican
Code Issues Proposed changes

Add customization for wsgi process display name

Browse Source 
Change-Id: I1c8cc8f9a695738f91402373d5d9bac93de24d16
Related-Bug: #1626550
This commit is contained in:
Xing Zhou 2016-12-21 15:10:33 +08:00
parent 8e9497de0f
commit 64b2553598
2 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
manifests/wsgi/apache.pp
View File

@ -69,6 +69,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
#
# == Dependencies
#
# requires Class['apache'] & Class['barbican']
@ -88,21 +92,22 @@
# Copyright 2015 Red Hat Inc. <licensing@redhat.com>
#
class barbican::wsgi::apache (
$servername = $::fqdn,
$public_port = 9311,
$bind_host = undef,
$public_path = '/',
$ssl = true,
$workers = 1,
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,
$ssl_ca = undef,
$ssl_crl_path = undef,
$ssl_crl = undef,
$ssl_certs_dir = undef,
$threads = $::os_workers,
$priority = '10',
$servername = $::fqdn,
$public_port = 9311,
$bind_host = undef,
$public_path = '/',
$ssl = true,
$workers = 1,
$ssl_cert = undef,
$ssl_key = undef,
$ssl_chain = undef,
$ssl_ca = undef,
$ssl_crl_path = undef,
$ssl_crl = undef,
$ssl_certs_dir = undef,
$wsgi_process_display_name = undef,
$threads = $::os_workers,
$priority = '10',
) {
include ::barbican::deps
@ -134,27 +139,28 @@ class barbican::wsgi::apache (
File[$::barbican::params::httpd_config_file] ~> Service['httpd']
::openstacklib::wsgi::apache { 'barbican_wsgi_main':
bind_host => $bind_host,
bind_port => $public_port,
group => 'barbican',
path => $public_path,
priority => $priority,
servername => $servername,
ssl => $ssl,
ssl_ca => $ssl_ca,
ssl_cert => $ssl_cert,
ssl_certs_dir => $ssl_certs_dir,
ssl_chain => $ssl_chain,
ssl_crl => $ssl_crl,
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => 'barbican',
workers => $workers,
wsgi_daemon_process => 'barbican-api',
wsgi_process_group => 'barbican-api',
wsgi_script_dir => $::barbican::params::barbican_wsgi_script_path,
wsgi_script_file => 'main',
wsgi_script_source => $::barbican::params::barbican_wsgi_script_source,
bind_host => $bind_host,
bind_port => $public_port,
group => 'barbican',
path => $public_path,
priority => $priority,
servername => $servername,
ssl => $ssl,
ssl_ca => $ssl_ca,
ssl_cert => $ssl_cert,
ssl_certs_dir => $ssl_certs_dir,
ssl_chain => $ssl_chain,
ssl_crl => $ssl_crl,
ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key,
threads => $threads,
user => 'barbican',
workers => $workers,
wsgi_daemon_process => 'barbican-api',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'barbican-api',
wsgi_script_dir => $::barbican::params::barbican_wsgi_script_path,
wsgi_script_file => 'main',
wsgi_script_source => $::barbican::params::barbican_wsgi_script_source,
}
}

25
spec/classes/barbican_wsgi_apache_spec.rb
View File

@ -56,6 +56,13 @@ describe 'barbican::wsgi::apache' do
'docroot_group' => 'barbican',
'ssl' => 'true',
'wsgi_daemon_process' => 'barbican-api',
'wsgi_daemon_process_options' => {
'user' => 'barbican',
'group' => 'barbican',
'processes' => 1,
'threads' => '8',
'display-name' => 'barbican_wsgi_main',
},
'wsgi_process_group' => 'barbican-api',
'wsgi_script_aliases' => { '/' => "#{platform_parameters[:wsgi_script_path]}/main" },
'require' => 'File[barbican_wsgi_main]',
@ -67,11 +74,12 @@ describe 'barbican::wsgi::apache' do
describe 'when overriding parameters using different ports' do
let :params do
{
:servername => 'dummy.host',
:bind_host => '10.42.51.1',
:public_port => 12345,
:ssl => false,
:workers => 37,
:servername => 'dummy.host',
:bind_host => '10.42.51.1',
:public_port => 12345,
:ssl => false,
:wsgi_process_display_name => 'barbican-api',
:workers => 37,
}
end
@ -84,6 +92,13 @@ describe 'barbican::wsgi::apache' do
'docroot_group' => 'barbican',
'ssl' => 'false',
'wsgi_daemon_process' => 'barbican-api',
'wsgi_daemon_process_options' => {
'user' => 'barbican',
'group' => 'barbican',
'processes' => '37',
'threads' => '8',
'display-name' => 'barbican-api',
},
'wsgi_process_group' => 'barbican-api',
'wsgi_script_aliases' => { '/' => "#{platform_parameters[:wsgi_script_path]}/main" },
'require' => 'File[barbican_wsgi_main]',