Merge "Add log_file parameter"

manifests/logging.pp

@@ -33,6 +33,10 @@
 #   directory.
 #   Defaults to '/var/log/cinder'
 #
+# [*log_file*]
+#   (Optional) File where logs should be stored.
+#   Defaults to $::os_service_default
+#
 # [*logging_context_format_string*]
 #   (Optional) Format string to use for log messages with context.
 #   Defaults to $::os_service_default
@@ -100,6 +104,7 @@ class cinder::logging(
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/cinder',
+  $log_file                      = $::os_service_default,
   $debug                         = $::os_service_default,
   $logging_context_format_string = $::os_service_default,
   $logging_default_format_string = $::os_service_default,
@@ -123,6 +128,7 @@ class cinder::logging(
     use_journal                   => $use_journal,
     use_stderr                    => $use_stderr,
     log_dir                       => $log_dir,
+    log_file                      => $log_file,
     syslog_log_facility           => $log_facility,
     logging_context_format_string => $logging_context_format_string,
     logging_default_format_string => $logging_default_format_string,

releasenotes/notes/add-log_file-for-logging-a9bbd949ed55b7f0.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add the log_file option for logging.

spec/classes/cinder_logging_spec.rb

@@ -28,6 +28,7 @@ describe 'cinder::logging' do
      :use_stderr                     => false,
      :log_facility                   => 'LOG_FOO',
      :log_dir                        => '/var/log',
+     :log_file                       => '/var/log/cinder/cinder.log',
      :debug                          => true,
     }
   end
@@ -62,6 +63,7 @@ describe 'cinder::logging' do
         :use_journal => '<SERVICE DEFAULT>',
         :use_stderr  => '<SERVICE DEFAULT>',
         :log_dir     => '/var/log/cinder',
+        :log_file    => '<SERVICE DEFAULT>',
         :debug       => '<SERVICE DEFAULT>',
       )
     end
@@ -76,6 +78,7 @@ describe 'cinder::logging' do
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',
+        :log_file            => '/var/log/cinder/cinder.log',
         :debug               => true,
       )
     end