openstack/puppet-vitrage
Code Issues Proposed changes

Add customization for wsgi process displayname

Browse Source 
Change-Id: I9877cce106597709da53c8c2f552344daaf9c41b
Related-Bug: #1626550
This commit is contained in:
Alex Schultz 2017-07-13 15:52:00 -06:00
parent dee785de4d
commit 4efb8e8df5
2 changed files with 50 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

@ -57,6 +57,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*]
@ -78,21 +82,22 @@
# class { 'vitrage::wsgi::apache': }
#
class vitrage::wsgi::apache (
$servername = $::fqdn,
$port = 8999,
$bind_host = undef,
$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,
$port = 8999,
$bind_host = undef,
$path = '/',
$ssl = true,
$workers = 1,
$wsgi_process_display_name = undef,
$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',
) {
include ::vitrage::deps
@ -104,27 +109,28 @@ class vitrage::wsgi::apache (
}
::openstacklib::wsgi::apache { 'vitrage_wsgi':
bind_host => $bind_host,
bind_port => $port,
group => 'vitrage',
path => $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 => 'vitrage',
workers => $workers,
wsgi_daemon_process => 'vitrage',
wsgi_process_group => 'vitrage',
wsgi_script_dir => $::vitrage::params::vitrage_wsgi_script_path,
wsgi_script_file => 'app',
wsgi_script_source => $::vitrage::params::vitrage_wsgi_script_source,
bind_host => $bind_host,
bind_port => $port,
group => 'vitrage',
path => $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 => 'vitrage',
workers => $workers,
wsgi_daemon_process => 'vitrage',
wsgi_process_group => 'vitrage',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_script_dir => $::vitrage::params::vitrage_wsgi_script_path,
wsgi_script_file => 'app',
wsgi_script_source => $::vitrage::params::vitrage_wsgi_script_source,
}
}

12
spec/classes/vitrage_wsgi_apache_spec.rb
View File

@ -28,11 +28,12 @@ describe 'vitrage::wsgi::apache' do
describe 'when overriding parameters using different ports' do
let :params do
{
:servername => 'dummy.host',
:bind_host => '10.42.51.1',
:port => 12345,
:ssl => false,
:workers => 37,
:servername => 'dummy.host',
:bind_host => '10.42.51.1',
:port => 12345,
:ssl => false,
:wsgi_process_display_name => 'vitrage',
:workers => 37,
}
end
it { is_expected.to contain_class('vitrage::params') }
@ -50,6 +51,7 @@ describe 'vitrage::wsgi::apache' do
:user => 'vitrage',
:workers => 37,
:wsgi_daemon_process => 'vitrage',
:wsgi_process_display_name => 'vitrage',
:wsgi_process_group => 'vitrage',
:wsgi_script_dir => platform_params[:wsgi_script_path],
:wsgi_script_file => 'app',