openstack/puppet-nova
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: Ibe7b293c538e3b1b260241022b71656258e3dc88
This commit is contained in:
ZhongShengping
2018-01-15 16:05:40 +08:00
parent 09a2419914
commit e211fcfd65
3 changed files with 19 additions and 5 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
@@ -92,6 +96,7 @@
class nova::logging( class nova::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/nova', $log_dir = '/var/log/nova',
@@ -169,6 +174,7 @@ class nova::logging(
use_stderr => $use_stderr_real, use_stderr => $use_stderr_real,
use_syslog => $use_syslog_real, use_syslog => $use_syslog_real,
use_json => $use_json, use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir_real, log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real, syslog_log_facility => $log_facility_real,
logging_context_format_string => $logging_context_format_string, logging_context_format_string => $logging_context_format_string,

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

@@ -25,6 +25,7 @@ describe 'nova::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/foo', :log_dir => '/var/log/foo',
@@ -57,11 +58,12 @@ describe 'nova::logging' do
shared_examples 'basic default logging settings' do shared_examples 'basic default logging settings' do
it 'configures nova logging settings with default values' do it 'configures nova logging settings with default values' do
is_expected.to contain_oslo__log('nova_config').with( is_expected.to contain_oslo__log('nova_config').with(
:use_syslog => '<SERVICE DEFAULT>', :use_syslog => '<SERVICE DEFAULT>',
:use_json => '<SERVICE DEFAULT>', :use_json => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>', :use_journal => '<SERVICE DEFAULT>',
:log_dir => '/var/log/nova', :use_stderr => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>', :log_dir => '/var/log/nova',
:debug => '<SERVICE DEFAULT>',
) )
is_expected.to contain_file('/var/log/nova').with( is_expected.to contain_file('/var/log/nova').with(
:owner => 'nova', :owner => 'nova',
@@ -78,6 +80,7 @@ describe 'nova::logging' do
is_expected.to contain_oslo__log('nova_config').with( is_expected.to contain_oslo__log('nova_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/foo', :log_dir => '/var/log/foo',