From: ZhongShengping <chdzsp@163.com>
Date: Tue, 12 Mar 2019 02:37:37 +0000 (+0800)
Subject: Add log_file parameter
X-Git-Tag: 14.4.0~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=201f379a43314dd354fee21a4c894e195708c4d5;p=puppet-modules%2Fpuppet-ceilometer.git

Add log_file parameter

Change-Id: I6a21a7b5cfbdb616085bd6e0c73ba201901bc242
Closes-Bug: #1819417
---

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 4c34cc2..0db1dfa 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -33,6 +33,10 @@
 #   If set to $::os_service_default, it will not log to any directory.
 #   Defaults to '/var/log/ceilometer'.
 #
+# [*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 ceilometer::logging(
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/ceilometer',
+  $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 ceilometer::logging(
     use_json                      => $use_json,
     use_journal                   => $use_journal,
     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,
diff --git a/releasenotes/notes/add-log_file-for-logging-be080bb51359db6e.yaml b/releasenotes/notes/add-log_file-for-logging-be080bb51359db6e.yaml
new file mode 100644
index 0000000..e40d4c8
--- /dev/null
+++ b/releasenotes/notes/add-log_file-for-logging-be080bb51359db6e.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add the log_file option for logging.
diff --git a/spec/classes/ceilometer_logging_spec.rb b/spec/classes/ceilometer_logging_spec.rb
index 9f08130..3f0fcd2 100644
--- a/spec/classes/ceilometer_logging_spec.rb
+++ b/spec/classes/ceilometer_logging_spec.rb
@@ -29,6 +29,7 @@ describe 'ceilometer::logging' do
      :use_stderr                     => false,
      :log_facility                   => 'LOG_FOO',
      :log_dir                        => '/var/log',
+     :log_file                       => '/var/log/ceilometer/ceilometer.log',
      :debug                          => true,
     }
   end
@@ -64,6 +65,7 @@ describe 'ceilometer::logging' do
         :use_stderr          => '<SERVICE DEFAULT>',
         :syslog_log_facility => '<SERVICE DEFAULT>',
         :log_dir             => '/var/log/ceilometer',
+        :log_file            => '<SERVICE DEFAULT>',
         :debug               => '<SERVICE DEFAULT>',
       )
     end
@@ -78,6 +80,7 @@ describe 'ceilometer::logging' do
         :use_stderr          => false,
         :syslog_log_facility => 'LOG_FOO',
         :log_dir             => '/var/log',
+        :log_file            => '/var/log/ceilometer/ceilometer.log',
         :debug               => true,
       )
     end