Add customization for wsgi process display name
Change-Id: I952b51508d5ec6ad6d0aab7e19df14f4dcd96ba3 Closes-Bug: #1626550
This commit is contained in:
parent
4c4a377378
commit
8befe4fb09
@ -89,6 +89,10 @@
|
|||||||
# { python-path => '/my/python/virtualenv' }
|
# { python-path => '/my/python/virtualenv' }
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
|
# [*wsgi_process_display_name*]
|
||||||
|
# (optional) Name of the WSGI process display-name.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -120,6 +124,7 @@ define heat::wsgi::apache (
|
|||||||
$access_log_format = false,
|
$access_log_format = false,
|
||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
|
$wsgi_process_display_name = undef,
|
||||||
) {
|
) {
|
||||||
if $title !~ /^api(|_cfn|_cloudwatch)$/ {
|
if $title !~ /^api(|_cfn|_cloudwatch)$/ {
|
||||||
fail('The valid options are api, api_cfn, api_cloudwatch')
|
fail('The valid options are api, api_cfn, api_cloudwatch')
|
||||||
@ -151,6 +156,7 @@ define heat::wsgi::apache (
|
|||||||
user => 'heat',
|
user => 'heat',
|
||||||
workers => $workers,
|
workers => $workers,
|
||||||
wsgi_daemon_process => "heat_${title}",
|
wsgi_daemon_process => "heat_${title}",
|
||||||
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
wsgi_process_group => "heat_${title}",
|
wsgi_process_group => "heat_${title}",
|
||||||
wsgi_script_dir => $::heat::params::heat_wsgi_script_path,
|
wsgi_script_dir => $::heat::params::heat_wsgi_script_path,
|
||||||
wsgi_script_file => "heat_${title}",
|
wsgi_script_file => "heat_${title}",
|
||||||
|
@ -81,6 +81,10 @@
|
|||||||
# { python-path => '/my/python/virtualenv' }
|
# { python-path => '/my/python/virtualenv' }
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
|
# [*wsgi_process_display_name*]
|
||||||
|
# (optional) Name of the WSGI process display-name.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -111,6 +115,7 @@ class heat::wsgi::apache_api (
|
|||||||
$access_log_format = false,
|
$access_log_format = false,
|
||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
|
$wsgi_process_display_name = undef,
|
||||||
) {
|
) {
|
||||||
heat::wsgi::apache { 'api':
|
heat::wsgi::apache { 'api':
|
||||||
port => $port,
|
port => $port,
|
||||||
@ -132,5 +137,6 @@ class heat::wsgi::apache_api (
|
|||||||
access_log_file => $access_log_file,
|
access_log_file => $access_log_file,
|
||||||
access_log_format => $access_log_format,
|
access_log_format => $access_log_format,
|
||||||
error_log_file => $error_log_file,
|
error_log_file => $error_log_file,
|
||||||
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,6 +81,10 @@
|
|||||||
# { python-path => '/my/python/virtualenv' }
|
# { python-path => '/my/python/virtualenv' }
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
|
# [*wsgi_process_display_name*]
|
||||||
|
# (optional) Name of the WSGI process display-name.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -111,6 +115,7 @@ class heat::wsgi::apache_api_cfn (
|
|||||||
$access_log_format = false,
|
$access_log_format = false,
|
||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
|
$wsgi_process_display_name = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
# See custom fragment below
|
# See custom fragment below
|
||||||
@ -150,5 +155,6 @@ class heat::wsgi::apache_api_cfn (
|
|||||||
access_log_file => $access_log_file,
|
access_log_file => $access_log_file,
|
||||||
access_log_format => $access_log_format,
|
access_log_format => $access_log_format,
|
||||||
error_log_file => $error_log_file,
|
error_log_file => $error_log_file,
|
||||||
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,6 +81,10 @@
|
|||||||
# { python-path => '/my/python/virtualenv' }
|
# { python-path => '/my/python/virtualenv' }
|
||||||
# Defaults to {}
|
# Defaults to {}
|
||||||
#
|
#
|
||||||
|
# [*wsgi_process_display_name*]
|
||||||
|
# (optional) Name of the WSGI process display-name.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
# == Dependencies
|
# == Dependencies
|
||||||
#
|
#
|
||||||
# requires Class['apache'] & Class['heat']
|
# requires Class['apache'] & Class['heat']
|
||||||
@ -111,6 +115,7 @@ class heat::wsgi::apache_api_cloudwatch (
|
|||||||
$access_log_format = false,
|
$access_log_format = false,
|
||||||
$error_log_file = undef,
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
|
$wsgi_process_display_name = undef,
|
||||||
) {
|
) {
|
||||||
heat::wsgi::apache { 'api_cloudwatch':
|
heat::wsgi::apache { 'api_cloudwatch':
|
||||||
port => $port,
|
port => $port,
|
||||||
@ -132,5 +137,6 @@ class heat::wsgi::apache_api_cloudwatch (
|
|||||||
access_log_file => $access_log_file,
|
access_log_file => $access_log_file,
|
||||||
access_log_format => $access_log_format,
|
access_log_format => $access_log_format,
|
||||||
error_log_file => $error_log_file,
|
error_log_file => $error_log_file,
|
||||||
|
wsgi_process_display_name => $wsgi_process_display_name,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Add wsgi_process_display_name option to add customization
|
||||||
|
for wsgi process display name.
|
@ -18,6 +18,7 @@ describe 'heat::wsgi::apache_api_cfn' do
|
|||||||
:ssl_ca => nil,
|
:ssl_ca => nil,
|
||||||
:ssl_crl_path => nil,
|
:ssl_crl_path => nil,
|
||||||
:ssl_certs_dir => nil,
|
:ssl_certs_dir => nil,
|
||||||
|
:wsgi_process_display_name => nil,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
:custom_wsgi_process_options => {},
|
:custom_wsgi_process_options => {},
|
||||||
|
@ -18,6 +18,7 @@ describe 'heat::wsgi::apache_api_cloudwatch' do
|
|||||||
:ssl_ca => nil,
|
:ssl_ca => nil,
|
||||||
:ssl_crl_path => nil,
|
:ssl_crl_path => nil,
|
||||||
:ssl_certs_dir => nil,
|
:ssl_certs_dir => nil,
|
||||||
|
:wsgi_process_display_name => nil,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
:custom_wsgi_process_options => {}, )
|
:custom_wsgi_process_options => {}, )
|
||||||
|
@ -18,6 +18,7 @@ describe 'heat::wsgi::apache_api' do
|
|||||||
:ssl_ca => nil,
|
:ssl_ca => nil,
|
||||||
:ssl_crl_path => nil,
|
:ssl_crl_path => nil,
|
||||||
:ssl_certs_dir => nil,
|
:ssl_certs_dir => nil,
|
||||||
|
:wsgi_process_display_name => nil,
|
||||||
:threads => 1,
|
:threads => 1,
|
||||||
:priority => 10,
|
:priority => 10,
|
||||||
:custom_wsgi_process_options => {},
|
:custom_wsgi_process_options => {},
|
||||||
|
Loading…
Reference in New Issue
Block a user