From 0d59c9f771f6fcb1feefbd7d15c85574829bdd7d Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Sat, 25 Nov 2017 11:58:26 +0200
Subject: [PATCH] Expose use_json logging option

It enables JSON-formatted logging from oslo.log.

Change-Id: I854a66368e1e556796dcc2a1d7ce66ca578346ad
---
 manifests/logging.pp                              | 6 ++++++
 releasenotes/notes/log-json-17df65db860a9b44.yaml | 4 ++++
 spec/classes/keystone_logging_spec.rb             | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/log-json-17df65db860a9b44.yaml

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 960db8b43..417de1edb 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -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,
diff --git a/releasenotes/notes/log-json-17df65db860a9b44.yaml b/releasenotes/notes/log-json-17df65db860a9b44.yaml
new file mode 100644
index 000000000..41c04132a
--- /dev/null
+++ b/releasenotes/notes/log-json-17df65db860a9b44.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Expose use_json logging parameter, which enables JSON formatted logging.
diff --git a/spec/classes/keystone_logging_spec.rb b/spec/classes/keystone_logging_spec.rb
index 91bb22822..47b4079d0 100644
--- a/spec/classes/keystone_logging_spec.rb
+++ b/spec/classes/keystone_logging_spec.rb
@@ -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',