From c9de4988543b6f0bf55891a4f3f90fa804abe74b Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 7 Aug 2015 15:43:47 +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: I964b86798b4462e7f2ed8729d6938eff162f1694 Closes-bug: #1482564 --- manifests/init.pp | 6 ++++++ spec/classes/cinder_spec.rb | 1 + 2 files changed, 7 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index f97010c4..72fb3cde 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -173,6 +173,10 @@ # Use syslog for logging. # (Optional) Defaults to false. # +# [*use_stderr*] +# (optional) Use stderr for logging +# Defaults to true +# # [*log_facility*] # Syslog facility to receive log lines. # (Optional) Defaults to LOG_USER. @@ -276,6 +280,7 @@ class cinder ( $key_file = false, $api_paste_config = '/etc/cinder/api-paste.ini', $use_syslog = false, + $use_stderr = true, $log_facility = 'LOG_USER', $log_dir = '/var/log/cinder', $verbose = false, @@ -430,6 +435,7 @@ class cinder ( 'database/retry_interval': value => $database_retry_interval; 'DEFAULT/verbose': value => $verbose; 'DEFAULT/debug': value => $debug; + 'DEFAULT/use_stderr': value => $use_stderr; 'DEFAULT/api_paste_config': value => $api_paste_config; 'DEFAULT/rpc_backend': value => $rpc_backend; 'DEFAULT/storage_availability_zone': value => $storage_availability_zone; diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb index 91e353bd..b565a2b9 100644 --- a/spec/classes/cinder_spec.rb +++ b/spec/classes/cinder_spec.rb @@ -37,6 +37,7 @@ describe 'cinder' do is_expected.to contain_cinder_config('database/max_overflow').with_ensure('absent') is_expected.to contain_cinder_config('DEFAULT/verbose').with(:value => false) is_expected.to contain_cinder_config('DEFAULT/debug').with(:value => false) + is_expected.to contain_cinder_config('DEFAULT/use_stderr').with(:value => true) is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova') is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova') is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')