openstack/puppet-ironic
Code Issues Proposed changes

Add use_journal option for logging configuration

Browse Source 
This enables oslo.log to pass logging records to journald.

Change-Id: I18ec0f9eb40624042dcdb4897b11be56190ddc00
This commit is contained in:
ZhongShengping 2018-01-15 15:51:46 +08:00
parent c547a02bdd
commit 339735f25d
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -16,6 +16,10 @@
# (Optional) Use json for logging.
# Defaults to $::os_service_default
#
# [*use_journal*]
# (Optional) Use journal for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to $::os_service_default
@ -92,6 +96,7 @@
class ironic::logging(
$use_syslog = $::os_service_default,
$use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/ironic',
@ -128,6 +133,7 @@ class ironic::logging(
use_stderr => $use_stderr_real,
use_syslog => $use_syslog_real,
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real,
logging_context_format_string => $logging_context_format_string,

5
releasenotes/notes/add-use_journal-option-for-logging-bb188924ad2f8d6c.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Adds the use_journal option for configuring oslo.log. This will enable
passing the logs to journald.

3
spec/classes/ironic_logging_spec.rb
View File

@ -25,6 +25,7 @@ describe 'ironic::logging' do
:log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
@ -71,6 +72,7 @@ describe 'ironic::logging' do
is_expected.to contain_oslo__log('ironic_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic',
@ -84,6 +86,7 @@ describe 'ironic::logging' do
is_expected.to contain_oslo__log('ironic_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',