openstack
/
puppet-keystone
Code Issues Proposed changes

Expose use_json logging option 

It enables JSON-formatted logging from oslo.log.

Change-Id: I854a66368e1e556796dcc2a1d7ce66ca578346ad
changes/19/522919/1
Juan Antonio Osorio Robles 2017-11-25 11:58:26 +02:00
parent 069edd02f0
commit 0d59c9f771
3 changed files with 13 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 journal for logging.
# Defaults to $::os_service_default
#
# [*use_json*]
# (Optional) Use JSON format for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to $::os_service_default
@ -109,6 +113,7 @@
class keystone::logging(
$use_syslog = $::os_service_default,
$use_journal = $::os_service_default,
$use_json = $::os_service_default,
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/keystone',
@ -157,6 +162,7 @@ class keystone::logging(
watch_log_file => $watch_log_file,
use_syslog => $use_syslog_real,
use_journal => $use_journal,
use_json => $use_json,
syslog_log_facility => $log_facility_real,
use_stderr => $use_stderr_real,
logging_context_format_string => $logging_context_format_string,

4
releasenotes/notes/log-json-17df65db860a9b44.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Expose use_json logging parameter, which enables JSON formatted logging.

3
spec/classes/keystone_logging_spec.rb
View File

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