Allow setting log files for nova-api apache vhost
This allows the setting of the error and access file logs, as well as the access log format. This was done in a similar fashion as one can configure these ones in the keystone wsgi manifest. Change-Id: I7e39baa2fefdc63d6f300cb037241846e0871eeb Depends-On: I5e7d3588b7b3b106813d6d37b55aa812273d04d6
This commit is contained in:

committed by
Alex Schultz

parent
8aa8426794
commit
f6b9f7318e
@@ -70,6 +70,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.
|
||||||
@@ -105,6 +117,9 @@ class nova::wsgi::apache_api (
|
|||||||
$wsgi_process_display_name = undef,
|
$wsgi_process_display_name = undef,
|
||||||
$threads = $::os_workers,
|
$threads = $::os_workers,
|
||||||
$priority = '10',
|
$priority = '10',
|
||||||
|
$access_log_file = false,
|
||||||
|
$access_log_format = false,
|
||||||
|
$error_log_file = undef,
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
@@ -144,6 +159,9 @@ class nova::wsgi::apache_api (
|
|||||||
wsgi_script_file => 'nova-api',
|
wsgi_script_file => 'nova-api',
|
||||||
wsgi_script_source => $::nova::params::nova_api_wsgi_script_source,
|
wsgi_script_source => $::nova::params::nova_api_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,
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -32,6 +32,9 @@ describe 'nova::wsgi::apache_api' do
|
|||||||
:wsgi_script_file => 'nova-api',
|
:wsgi_script_file => 'nova-api',
|
||||||
:wsgi_script_source => platform_params[:api_wsgi_script_source],
|
:wsgi_script_source => platform_params[:api_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
|
||||||
|
|
||||||
@@ -57,6 +60,9 @@ describe 'nova::wsgi::apache_api' 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
|
||||||
|
|
||||||
@@ -83,6 +89,9 @@ describe 'nova::wsgi::apache_api' 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
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user