openstack/puppet-murano
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: If018b692b47c3830d2febfc694129066da8f1219
This commit is contained in:
ZhongShengping 2018-01-15 15:58:51 +08:00
parent 40de925e9e
commit cfd0d5b9d5
5 changed files with 33 additions and 10 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
@ -93,6 +97,7 @@ class murano::logging(
$debug = $::os_service_default,
$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/murano',
@ -127,6 +132,7 @@ class murano::logging(
debug => $debug_real,
use_syslog => $use_syslog_real,
use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr_real,
log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real,

6
manifests/logging_cfapi.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
@ -93,6 +97,7 @@ class murano::logging_cfapi(
$debug = $::os_service_default,
$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/murano_cfapi',
@ -115,6 +120,7 @@ class murano::logging_cfapi(
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-b316ff864308e755.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.

13
spec/classes/murano_logging_cfapi_spec.rb
View File

@ -12,6 +12,7 @@ describe 'murano::logging_cfapi' do
:debug => 'true',
:use_syslog => 'true',
:use_json => 'true',
:use_journal => 'true',
:use_stderr => 'false',
:log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano_cfapi',
@ -62,11 +63,12 @@ describe 'murano::logging_cfapi' do
context 'with defaults' do
it { is_expected.to contain_oslo__log('murano_cfapi_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano_cfapi',
:debug => '<SERVICE DEFAULT>',
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano_cfapi',
:debug => '<SERVICE DEFAULT>',
)}
end
@ -87,6 +89,7 @@ describe 'murano::logging_cfapi' do
it { is_expected.to contain_oslo__log('murano_cfapi_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano_cfapi',

13
spec/classes/murano_logging_spec.rb
View File

@ -12,6 +12,7 @@ describe 'murano::logging' do
:debug => 'true',
:use_syslog => 'true',
:use_json => 'true',
:use_journal => 'true',
:use_stderr => 'false',
:log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano',
@ -62,11 +63,12 @@ describe 'murano::logging' do
context 'with defaults' do
it { is_expected.to contain_oslo__log('murano_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano',
:debug => '<SERVICE DEFAULT>',
:use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano',
:debug => '<SERVICE DEFAULT>',
)}
end
@ -87,6 +89,7 @@ describe 'murano::logging' do
it { is_expected.to contain_oslo__log('murano_config').with(
:use_syslog => true,
:use_json => true,
:use_journal => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano',