From 69692f598987f9cb98c1909db7c891d143aaa853 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 7 Aug 2015 15:44:01 +0300 Subject: [PATCH] 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) --- manifests/init.pp | 5 +++++ spec/classes/ceilometer_init_spec.rb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index b45a5ff..8b29b40 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -22,6 +22,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' @@ -82,6 +85,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', @@ -255,6 +259,7 @@ class ceilometer( 'publisher/metering_secret' : value => $metering_secret, secret => true; '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 ca2c783..1183b79 100644 --- 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 @@ -126,6 +127,10 @@ describe 'ceilometer' do is_expected.to contain_ceilometer_config('DEFAULT/verbose').with_value( params[:verbose] ) end + it 'configures use_stderr option' do + is_expected.to contain_ceilometer_config('DEFAULT/use_stderr').with_value( params[:use_stderr] ) + end + it 'configures logging directory by default' do is_expected.to contain_ceilometer_config('DEFAULT/log_dir').with_value( params[:log_dir] ) end -- 2.45.2