From 814222f6b92fe41cb5dc4ca51e3ea852cbdd253c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 25 Feb 2014 16:34:41 +0100 Subject: [PATCH] avoid double logging for ceilometer Signed-off-by: Emilien Macchi --- manifests/telemetry.pp | 7 +++++++ spec/classes/cloud_telemetry_centralagent_spec.rb | 3 ++- spec/classes/cloud_telemetry_server_spec.rb | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index cbe9cd3f..04fc8f65 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -84,6 +84,13 @@ class cloud::telemetry( $use_syslog = $os_params::use_syslog, ){ + # Disable twice logging if syslog is enabled + if $use_syslog { + $log_dir = false + } else { + $log_dir = '/var/log/ceilometer' + } + class { 'ceilometer': metering_secret => $ceilometer_secret, rabbit_hosts => $rabbit_hosts, diff --git a/spec/classes/cloud_telemetry_centralagent_spec.rb b/spec/classes/cloud_telemetry_centralagent_spec.rb index 7ecf7131..e05b8aea 100644 --- a/spec/classes/cloud_telemetry_centralagent_spec.rb +++ b/spec/classes/cloud_telemetry_centralagent_spec.rb @@ -51,7 +51,8 @@ describe 'cloud::telemetry::centralagent' do :rabbit_password => 'secrete', :metering_secret => 'secrete', :use_syslog => true, - :log_facility => 'LOG_LOCAL0' + :log_facility => 'LOG_LOCAL0', + :log_dir => false ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb index 31a3230b..1d8d6873 100644 --- a/spec/classes/cloud_telemetry_server_spec.rb +++ b/spec/classes/cloud_telemetry_server_spec.rb @@ -57,7 +57,8 @@ describe 'cloud::telemetry::server' do :rabbit_password => 'secrete', :metering_secret => 'secrete', :use_syslog => true, - :log_facility => 'LOG_LOCAL0' + :log_facility => 'LOG_LOCAL0', + :log_dir => false ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete',