openstack/puppet-keystone
Code Issues Proposed changes

Merge "Add use_journal option for logging configuration"

Browse Source
This commit is contained in:
Jenkins
2017-10-10 00:45:36 +00:00
committed by Gerrit Code Review
parent 5481193433 aabe420a3f
commit 27e5956b13
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

@@ -12,6 +12,10 @@
# (Optional) Use syslog for logging. # (Optional) Use syslog 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
@@ -104,6 +108,7 @@
# #
class keystone::logging( class keystone::logging(
$use_syslog = $::os_service_default, $use_syslog = $::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/keystone', $log_dir = '/var/log/keystone',
@@ -151,6 +156,7 @@ class keystone::logging(
log_dir => $log_dir_real, log_dir => $log_dir_real,
watch_log_file => $watch_log_file, watch_log_file => $watch_log_file,
use_syslog => $use_syslog_real, use_syslog => $use_syslog_real,
use_journal => $use_journal,
syslog_log_facility => $log_facility_real, syslog_log_facility => $log_facility_real,
use_stderr => $use_stderr_real, use_stderr => $use_stderr_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-7eeca0fccb658f3a.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/keystone_logging_spec.rb
View File

@@ -24,6 +24,7 @@ describe 'keystone::logging' do
:instance_uuid_format => '[instance: %(uuid)s] ', :instance_uuid_format => '[instance: %(uuid)s] ',
: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_journal => true,
:use_stderr => false, :use_stderr => false,
:log_facility => 'LOG_FOO', :log_facility => 'LOG_FOO',
:log_dir => '/var/log', :log_dir => '/var/log',
@@ -58,6 +59,7 @@ describe 'keystone::logging' do
it 'configures keystone logging settings with default values' do it 'configures keystone logging settings with default values' do
is_expected.to contain_oslo__log('keystone_config').with( is_expected.to contain_oslo__log('keystone_config').with(
:use_syslog => '<SERVICE DEFAULT>', :use_syslog => '<SERVICE DEFAULT>',
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>', :use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/keystone', :log_dir => '/var/log/keystone',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',
@@ -70,6 +72,7 @@ describe 'keystone::logging' do
it 'configures keystone logging settings with non-default values' do it 'configures keystone logging settings with non-default values' do
is_expected.to contain_oslo__log('keystone_config').with( is_expected.to contain_oslo__log('keystone_config').with(
:use_syslog => true, :use_syslog => 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',