openstack/puppet-magnum
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: Id372d8383c7d18cc2b653bc831b2d4adeb9b97f3
This commit is contained in:
ZhongShengping 2018-01-15 15:53:12 +08:00
parent dabc9d9d1f
commit ed246a7814
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
@ -96,6 +100,7 @@
class magnum::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/magnum',
@ -119,6 +124,7 @@ class magnum::logging(
debug => $debug,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr,
log_dir => $log_dir,
syslog_log_facility => $log_facility,

5
releasenotes/notes/add-use_journal-option-for-logging-9dd846f83cb4c3bf.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/magnum_logging_spec.rb
View File

@ -25,6 +25,7 @@ describe 'magnum::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',
@ -59,6 +60,7 @@ describe 'magnum::logging' do
is_expected.to contain_oslo__log('magnum_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/magnum',
:debug => '<SERVICE DEFAULT>',
@ -71,6 +73,7 @@ describe 'magnum::logging' do
is_expected.to contain_oslo__log('magnum_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',