openstack/puppet-octavia
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: Iaa8d36d4622f6b58885a8c82ac04fa489fd2ba5b
This commit is contained in:
ZhongShengping
2018-01-15 16:06:56 +08:00
parent bab31c0ba2
commit d2fa948463
3 changed files with 14 additions and 0 deletions
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. # (Optional) Use json for logging.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*use_journal*]
# (Optional) Use journal for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*] # [*use_stderr*]
# (optional) Use stderr for logging # (optional) Use stderr for logging
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -100,6 +104,7 @@
class octavia::logging( class octavia::logging(
$use_syslog = $::os_service_default, $use_syslog = $::os_service_default,
$use_json = $::os_service_default, $use_json = $::os_service_default,
$use_journal = $::os_service_default,
$use_stderr = $::os_service_default, $use_stderr = $::os_service_default,
$log_facility = $::os_service_default, $log_facility = $::os_service_default,
$log_dir = '/var/log/octavia', $log_dir = '/var/log/octavia',
@@ -124,6 +129,7 @@ class octavia::logging(
debug => $debug, debug => $debug,
use_syslog => $use_syslog, use_syslog => $use_syslog,
use_json => $use_json, use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr, use_stderr => $use_stderr,
log_dir => $log_dir, log_dir => $log_dir,
log_file => $log_file, log_file => $log_file,

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

@@ -25,6 +25,7 @@ describe 'octavia::logging' do
:log_date_format => '%Y-%m-%d %H:%M:%S', :log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => true, :use_syslog => true,
:use_json => true, :use_json => true,
:use_journal => true,
:use_stderr => false, :use_stderr => false,
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
@@ -60,6 +61,7 @@ describe 'octavia::logging' do
is_expected.to contain_oslo__log('octavia_config').with( is_expected.to contain_oslo__log('octavia_config').with(
:use_syslog => '<SERVICE DEFAULT>', :use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>', :use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>', :use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>', :syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/octavia', :log_dir => '/var/log/octavia',
@@ -74,6 +76,7 @@ describe 'octavia::logging' do
is_expected.to contain_oslo__log('octavia_config').with( is_expected.to contain_oslo__log('octavia_config').with(
:use_syslog => true, :use_syslog => true,
:use_json => true, :use_json => true,
:use_journal => true,
:use_stderr => false, :use_stderr => false,
:syslog_log_facility => 'LOG_FOO', :syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',