openstack
/
puppet-ceilometer
Code Issues Proposed changes

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
This commit is contained in:
Sergey Kolekonov 2015-08-07 15:44:01 +03:00
parent 6d461c803b
commit 985c48951b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -33,6 +33,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'
@ -115,6 +118,7 @@ class ceilometer(
$log_dir = '/var/log/ceilometer',
$verbose = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$rpc_backend = 'rabbit',
$rabbit_host = '127.0.0.1',
@ -297,6 +301,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, ',');
'database/event_time_to_live' : value => $event_time_to_live;
'database/metering_time_to_live' : value => $metering_time_to_live;

5
spec/classes/ceilometer_init_spec.rb
View File

@ -12,6 +12,7 @@ describe 'ceilometer' do
:debug => 'False',
:log_dir => '/var/log/ceilometer',
:verbose => 'False',
:use_stderr => 'True',
}
end
@ -145,6 +146,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