Add an ability to manage use_stderr parameter

When logging is already set up, it can be useful to disable this option
to avoid logs duplication (collected by Upstart, for example)

Change-Id: I6c3e33e8ac3b018941eb0a1c584701c4483a3a11
Closes-bug: #1482564
(cherry picked from commit 985c48951b42810cbfcf3a077c8773a8787fa6d2)

diff --git a/manifests/init.pp b/manifests/init.pp
index 87302fa12d301d47c0e725740bc6d89c325f12ec..2d631b01019091fdef0cd1d0519dee77929e090c 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,6 +18,9 @@
 #  [*use_syslog*]
 #    (optional) Use syslog for logging
 #    Defaults to false
+#  [*use_stderr*]
+#    (optional) Use stderr for logging
+#    Defaults to true
 #  [*log_facility*]
 #    (optional) Syslog facility to receive log lines.
 #    Defaults to 'LOG_USER'
@@ -79,6 +82,7 @@ class ceilometer(
   $log_dir             = '/var/log/ceilometer',
   $verbose             = false,
   $use_syslog          = false,
+  $use_stderr          = true,
   $log_facility        = 'LOG_USER',
   $rpc_backend         = 'ceilometer.openstack.common.rpc.impl_kombu',
   $rabbit_host         = '127.0.0.1',
@@ -252,6 +256,7 @@ class ceilometer(
     'publisher/metering_secret'      : value => $metering_secret;
     'DEFAULT/debug'                  : value => $debug;
     'DEFAULT/verbose'                : value => $verbose;
+    'DEFAULT/use_stderr'             : value => $use_stderr;
     'DEFAULT/notification_topics'    : value => join($notification_topics, ',');
   }
 

diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 007386883cd9ca5059bd3c055f766d066fb8c21d..af847ce9dbb66861b667ed56b34cfb03dae519ea 100644 (file)
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -9,6 +9,7 @@ describe 'ceilometer' do
       :debug              => 'False',
       :log_dir            => '/var/log/ceilometer',
       :verbose            => 'False',
+      :use_stderr         => 'True',
     }
   end
 
@@ -125,6 +126,10 @@ describe 'ceilometer' do
       should contain_ceilometer_config('DEFAULT/verbose').with_value( params[:verbose] )
     end
 
+    it 'configures use_stderr option' do
+      should contain_ceilometer_config('DEFAULT/use_stderr').with_value( params[:use_stderr] )
+    end
+
     it 'configures logging directory by default' do
       should contain_ceilometer_config('DEFAULT/log_dir').with_value( params[:log_dir] )
     end