openstack/puppet-nova
Code Issues Proposed changes

Merge "Allow setting log files for nova-placement apache vhost"

Browse Source
This commit is contained in:
Jenkins
2017-10-09 03:58:46 +00:00
committed by Gerrit Code Review
parent 1e34ff0c68 30edd5b793
commit 9e49036b72
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/wsgi/apache_placement.pp
View File

@@ -72,6 +72,18 @@
# apache::vhost ssl parameters. # apache::vhost ssl parameters.
# Optional. Default to apache::vhost 'ssl_*' defaults. # Optional. Default to apache::vhost 'ssl_*' defaults.
# #
# [*access_log_file*]
# The log file name for the virtualhost.
# Optional. Defaults to false.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to false.
#
# [*error_log_file*]
# The error log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*custom_wsgi_process_options*] # [*custom_wsgi_process_options*]
# (optional) gives you the oportunity to add custom process options or to # (optional) gives you the oportunity to add custom process options or to
# overwrite the default options for the WSGI main process. # overwrite the default options for the WSGI main process.
@@ -104,6 +116,9 @@ class nova::wsgi::apache_placement (
$threads = $::os_workers, $threads = $::os_workers,
$priority = '10', $priority = '10',
$ensure_package = 'present', $ensure_package = 'present',
$access_log_file = false,
$access_log_format = false,
$error_log_file = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
) { ) {
@@ -160,6 +175,9 @@ class nova::wsgi::apache_placement (
wsgi_script_file => 'nova-placement-api', wsgi_script_file => 'nova-placement-api',
wsgi_script_source => $::nova::params::placement_wsgi_script_source, wsgi_script_source => $::nova::params::placement_wsgi_script_source,
custom_wsgi_process_options => $custom_wsgi_process_options, custom_wsgi_process_options => $custom_wsgi_process_options,
access_log_file => $access_log_file,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
} }
} }

9
spec/classes/nova_wsgi_apache_placement_spec.rb
View File

@@ -37,6 +37,9 @@ describe 'nova::wsgi::apache_placement' do
:wsgi_script_file => 'nova-placement-api', :wsgi_script_file => 'nova-placement-api',
:wsgi_script_source => platform_params[:placement_wsgi_script_source], :wsgi_script_source => platform_params[:placement_wsgi_script_source],
:custom_wsgi_process_options => {}, :custom_wsgi_process_options => {},
:access_log_file => false,
:access_log_format => false,
:error_log_file => nil,
)} )}
end end
@@ -61,6 +64,9 @@ describe 'nova::wsgi::apache_placement' do
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
'python_path' => '/my/python/path', 'python_path' => '/my/python/path',
}, },
:access_log_file => '/var/log/httpd/access_log',
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log'
} }
end end
@@ -93,6 +99,9 @@ describe 'nova::wsgi::apache_placement' do
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
'python_path' => '/my/python/path', 'python_path' => '/my/python/path',
}, },
:access_log_file => '/var/log/httpd/access_log',
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log'
)} )}
end end
end end