From b6eccd19cdfb95f3ad311bf1a41a12a7e0a672f3 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Tue, 25 Feb 2014 16:40:40 +0100 Subject: [PATCH] [telemetry] Disable fs logging if syslog is enabled (refs: #187) --- manifests/telemetry.pp | 1 + spec/classes/cloud_image_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index 04fc8f65..ad073b05 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -98,6 +98,7 @@ class cloud::telemetry( rabbit_userid => 'ceilometer', verbose => $verbose, debug => $debug, + log_dir => $log_dir, use_syslog => $use_syslog, log_facility => $log_facility } diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb index afdc9d5b..4e9b5b51 100644 --- a/spec/classes/cloud_image_spec.rb +++ b/spec/classes/cloud_image_spec.rb @@ -58,7 +58,7 @@ describe 'cloud::image' do :log_facility => 'LOG_LOCAL0', :bind_host => '10.0.0.1', :bind_port => '9292', - :use_syslog => true, + :use_syslog => true ) end @@ -76,7 +76,7 @@ describe 'cloud::image' do :bind_port => '9191', :use_syslog => true, :log_dir => false, - :log_file => false, + :log_file => false ) end