openstack
/
puppet-nova
Code Issues Proposed changes

Add watch_log_file option 

Add support for Using logging handler designed to watch file system.

Change-Id: Id40a6d6882a7468536de93318a6a59c134eef938
Closes-Bug: #1943212
This commit is contained in:
ZhongShengping 2021-09-14 16:02:09 +08:00
parent 7e90c28287
commit 5cf2e50fa3
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -37,6 +37,10 @@
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $::os_service_default
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
@ -105,6 +109,7 @@ class nova::logging(
$log_facility = $::os_service_default,
$log_dir = '/var/log/nova',
$log_file = $::os_service_default,
$watch_log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
@ -140,6 +145,7 @@ class nova::logging(
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

4
releasenotes/notes/add_watch_log_file-option-935931045c6c0498.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``nova::logging::watch_log_file`` parameter has been added.

17
spec/classes/nova_logging_spec.rb
View File

@ -30,6 +30,7 @@ describe 'nova::logging' do
:log_facility => 'LOG_FOO',
:log_dir => '/var/log/foo',
:log_file => '/var/log/foo/nova.log',
:watch_log_file => true,
:debug => true,
}
end
@ -59,13 +60,14 @@ describe 'nova::logging' do
shared_examples 'basic default logging settings' do
it 'configures nova logging settings with default values' do
is_expected.to contain_oslo__log('nova_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/nova',
:log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/nova',
:log_file => '<SERVICE DEFAULT>',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)
is_expected.to contain_file('/var/log/nova/nova-manage.log').with(
:owner => 'nova',
@ -83,6 +85,7 @@ describe 'nova::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log/foo',
:log_file => '/var/log/foo/nova.log',
:watch_log_file => true,
:debug => true,
)
is_expected.to contain_file('/var/log/foo/nova-manage.log').with(