From bf84617285c0c0276536f01ff90d1cacaf027e7e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 26 Jan 2014 15:06:40 +0100 Subject: [PATCH] telemetry: update log params to master Signed-off-by: Emilien Macchi --- manifests/telemetry.pp | 7 ++----- spec/classes/cloud_telemetry_centralagent_spec.rb | 6 +++--- spec/classes/cloud_telemetry_server_spec.rb | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index f50e1cea..9eb5d5f1 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -35,11 +35,8 @@ class cloud::telemetry( rabbit_userid => 'ceilometer', verbose => $verbose, debug => $debug, - } - - ceilometer_config { - 'DEFAULT/syslog_log_facility': value => 'LOG_LOCAL0'; - 'DEFAULT/use_syslog': value => 'yes'; + use_syslog => true, + log_facility => 'LOG_LOCAL0' } class { 'ceilometer::agent::auth': diff --git a/spec/classes/cloud_telemetry_centralagent_spec.rb b/spec/classes/cloud_telemetry_centralagent_spec.rb index c5475f7c..05d93e37 100644 --- a/spec/classes/cloud_telemetry_centralagent_spec.rb +++ b/spec/classes/cloud_telemetry_centralagent_spec.rb @@ -46,14 +46,14 @@ describe 'cloud::telemetry::centralagent' do :rabbit_userid => 'ceilometer', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', - :metering_secret => 'secrete' + :metering_secret => 'secrete', + :use_syslog => true, + :log_facility => 'LOG_LOCAL0' ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', :auth_url => 'http://10.0.0.1:5000/v2.0' ) - should contain_ceilometer_config('DEFAULT/syslog_log_facility').with('value' => 'LOG_LOCAL0') - should contain_ceilometer_config('DEFAULT/use_syslog').with('value' => 'yes') end it 'configure ceilometer central agent' do diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb index 47ecab98..c0e884fe 100644 --- a/spec/classes/cloud_telemetry_server_spec.rb +++ b/spec/classes/cloud_telemetry_server_spec.rb @@ -51,14 +51,14 @@ describe 'cloud::telemetry::server' do :rabbit_userid => 'ceilometer', :rabbit_hosts => ['10.0.0.1'], :rabbit_password => 'secrete', - :metering_secret => 'secrete' + :metering_secret => 'secrete', + :use_syslog => true, + :log_facility => 'LOG_LOCAL0' ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', :auth_url => 'http://10.0.0.1:5000/v2.0' ) - should contain_ceilometer_config('DEFAULT/syslog_log_facility').with('value' => 'LOG_LOCAL0') - should contain_ceilometer_config('DEFAULT/use_syslog').with('value' => 'yes') end it 'check mongodb is started' do