Add use_journal option for logging configuration

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

Change-Id: I11ad2c8557fb2e6793c5ca368d21cf08833e2f32

manifests/api/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.
@@ -97,6 +101,7 @@
 class glance::api::logging(
   $use_syslog                    = $::os_service_default,
   $use_json                      = $::os_service_default,
+  $use_journal                   = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/glance',
@@ -139,6 +144,7 @@
     use_stderr                    => $use_stderr_real,
     use_syslog                    => $use_syslog_real,
     use_json                      => $use_json,
+    use_journal                   => $use_journal,
     log_dir                       => $log_dir_real,
     log_file                      => $log_file_real,
     syslog_log_facility           => $log_facility_real,

manifests/registry/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.
@@ -97,6 +101,7 @@
 class glance::registry::logging(
   $use_syslog                    = $::os_service_default,
   $use_json                      = $::os_service_default,
+  $use_journal                   = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/glance',
@@ -135,6 +140,7 @@
     use_stderr                    => $use_stderr_real,
     use_syslog                    => $use_syslog_real,
     use_json                      => $use_json,
+    use_journal                   => $use_journal,
     log_dir                       => $log_dir_real,
     log_file                      => $log_file_real,
     syslog_log_facility           => $log_facility_real,

releasenotes/notes/add-use_journal-option-for-logging-9d1bab2bd5816127.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds the use_journal option for configuring oslo.log. This will enable
+    passing the logs to journald.

spec/classes/glance_api_logging_spec.rb

@@ -25,6 +25,7 @@
      :log_date_format => '%Y-%m-%d %H:%M:%S',
      :use_syslog => true,
      :use_json => true,
+     :use_journal => true,
      :use_stderr => false,
      :log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
@@ -58,12 +59,13 @@
   shared_examples 'basic default logging settings' do
     it 'configures glance logging settings with default values' do
       is_expected.to contain_oslo__log('glance_api_config').with(
-        :use_syslog => '<SERVICE DEFAULT>',
-        :use_json   => '<SERVICE DEFAULT>',
-        :use_stderr => '<SERVICE DEFAULT>',
-        :log_dir    => '/var/log/glance',
-        :log_file   => '/var/log/glance/api.log',
-        :debug      => '<SERVICE DEFAULT>',
+        :use_syslog  => '<SERVICE DEFAULT>',
+        :use_json    => '<SERVICE DEFAULT>',
+        :use_journal => '<SERVICE DEFAULT>',
+        :use_stderr  => '<SERVICE DEFAULT>',
+        :log_dir     => '/var/log/glance',
+        :log_file    => '/var/log/glance/api.log',
+        :debug       => '<SERVICE DEFAULT>',
       )
     end
   end
@@ -73,6 +75,7 @@
       is_expected.to contain_oslo__log('glance_api_config').with(
         :use_syslog          => true,
         :use_json            => true,
+        :use_journal         => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',

spec/classes/glance_registry_logging_spec.rb

@@ -25,6 +25,7 @@
      :log_date_format => '%Y-%m-%d %H:%M:%S',
      :use_syslog => true,
      :use_json => true,
+     :use_journal => true,
      :use_stderr => false,
      :log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
@@ -58,12 +59,13 @@
   shared_examples 'basic default logging settings' do
     it 'configures glance logging settings with default values' do
       is_expected.to contain_oslo__log('glance_registry_config').with(
-        :use_syslog => '<SERVICE DEFAULT>',
-        :use_json   => '<SERVICE DEFAULT>',
-        :use_stderr => '<SERVICE DEFAULT>',
-        :log_dir    => '/var/log/glance',
-        :log_file   => '/var/log/glance/registry.log',
-        :debug      => '<SERVICE DEFAULT>',
+        :use_syslog  => '<SERVICE DEFAULT>',
+        :use_json    => '<SERVICE DEFAULT>',
+        :use_journal => '<SERVICE DEFAULT>',
+        :use_stderr  => '<SERVICE DEFAULT>',
+        :log_dir     => '/var/log/glance',
+        :log_file    => '/var/log/glance/registry.log',
+        :debug       => '<SERVICE DEFAULT>',
       )
     end
   end
@@ -73,6 +75,7 @@
       is_expected.to contain_oslo__log('glance_registry_config').with(
         :use_syslog          => true,
         :use_json            => true,
+        :use_journal         => true,
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',