From ae0785e3d4e3066cab97626df9343ccec5e039e7 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 15 Jan 2018 17:39:06 +0800
Subject: [PATCH] Add use_journal option for logging configuration

This enables oslo.log to pass logging records to journald.

Change-Id: If0fee161d0225d399a54bf8679de993af0644f96
---
 manifests/logging.pp                                        | 6 ++++++
 ...add-use_journal-option-for-logging-99d82c6c8d195dcf.yaml | 5 +++++
 spec/classes/watcher_logging_spec.rb                        | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-use_journal-option-for-logging-99d82c6c8d195dcf.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 057b3fd..78637be 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -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
@@ -100,6 +104,7 @@
 class watcher::logging(
   $use_syslog                    = $::os_service_default,
   $use_json                      = $::os_service_default,
+  $use_journal                   = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $syslog_log_facility           = $::os_service_default,
   $log_dir                       = '/var/log/watcher',
@@ -124,6 +129,7 @@ class watcher::logging(
     use_stderr                    => $use_stderr,
     use_syslog                    => $use_syslog,
     use_json                      => $use_json,
+    use_journal                   => $use_journal,
     log_dir                       => $log_dir,
     log_file                      => $log_file,
     debug                         => $debug,
diff --git a/releasenotes/notes/add-use_journal-option-for-logging-99d82c6c8d195dcf.yaml b/releasenotes/notes/add-use_journal-option-for-logging-99d82c6c8d195dcf.yaml
new file mode 100644
index 0000000..12b190e
--- /dev/null
+++ b/releasenotes/notes/add-use_journal-option-for-logging-99d82c6c8d195dcf.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the use_journal option for configuring oslo.log. This will enable
+    passing the logs to journald.
diff --git a/spec/classes/watcher_logging_spec.rb b/spec/classes/watcher_logging_spec.rb
index 09c6c08..f7e10c1 100644
--- a/spec/classes/watcher_logging_spec.rb
+++ b/spec/classes/watcher_logging_spec.rb
@@ -25,6 +25,7 @@ describe 'watcher::logging' do
      :log_date_format => '%Y-%m-%d %H:%M:%S',
      :use_syslog => true,
      :use_json => true,
+     :use_journal => true,
      :use_stderr => false,
      :syslog_log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
@@ -60,6 +61,7 @@ describe 'watcher::logging' do
       is_expected.to contain_oslo__log('watcher_config').with(
         :use_syslog          => '<SERVICE DEFAULT>',
         :use_json            => '<SERVICE DEFAULT>',
+        :use_journal         => '<SERVICE DEFAULT>',
         :use_stderr          => '<SERVICE DEFAULT>',
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/watcher',
@@ -74,6 +76,7 @@ describe 'watcher::logging' do
       is_expected.to contain_oslo__log('watcher_config').with(
         :use_syslog          => true,
         :use_json            => true,
+        :use_journal         => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',