openstack
/
puppet-ironic
Code Issues Proposed changes

Add log_file parameter 

Change-Id: I5592a12f1cda9ca00a23e84dbff31eff871b4a89
Closes-Bug: #1819417
This commit is contained in:
ZhongShengping 2019-03-12 10:37:38 +08:00
parent 95364eff50
commit 8b97a6901f
5 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/inspector/logging.pp
View File

@ -29,6 +29,10 @@
# If set to $::os_service_default, it will not log to any directory.
# Defaults to '/var/log/ironic-inspector'
#
# [*log_file*]
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
#
# [*logging_context_format_string*]
# (optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
@ -95,6 +99,7 @@ class ironic::inspector::logging(
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/ironic-inspector',
$log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
@ -117,6 +122,7 @@ class ironic::inspector::logging(
use_syslog => $use_syslog,
use_json => $use_json,
log_dir => $log_dir,
log_file => $log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

6
manifests/logging.pp
View File

@ -33,6 +33,10 @@
# If set to $::os_service_default, it will not log to any directory.
# Defaults to '/var/log/ironic'
#
# [*log_file*]
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default
@ -100,6 +104,7 @@ class ironic::logging(
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/ironic',
$log_file = $::os_service_default,
$debug = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
@ -123,6 +128,7 @@ class ironic::logging(
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $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-log_file-for-logging-988963eb917c9ad9.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add the log_file option for logging.

3
spec/classes/ironic_inspector_logging_spec.rb
View File

@ -28,6 +28,7 @@ describe 'ironic::inspector::logging' do
:use_stderr => false,
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:debug => true,
}
end
@ -62,6 +63,7 @@ describe 'ironic::inspector::logging' do
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic-inspector',
:log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)
end
@ -75,6 +77,7 @@ describe 'ironic::inspector::logging' do
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:debug => true,
)
end

3
spec/classes/ironic_logging_spec.rb
View File

@ -29,6 +29,7 @@ describe 'ironic::logging' do
:use_stderr => false,
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:debug => true,
}
end
@ -76,6 +77,7 @@ describe 'ironic::logging' do
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic',
:log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)
end
@ -90,6 +92,7 @@ describe 'ironic::logging' do
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:debug => true,
)
end