stackforge/puppet-openstack-cloud
Code Issues Proposed changes

avoid double logging for ceilometer

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-25 16:34:41 +01:00
parent 99b539988c
commit 814222f6b9
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/telemetry.pp
View File

@@ -84,6 +84,13 @@ class cloud::telemetry(
$use_syslog = $os_params::use_syslog, $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': class { 'ceilometer':
metering_secret => $ceilometer_secret, metering_secret => $ceilometer_secret,
rabbit_hosts => $rabbit_hosts, rabbit_hosts => $rabbit_hosts,

3
spec/classes/cloud_telemetry_centralagent_spec.rb
View File

@@ -51,7 +51,8 @@ describe 'cloud::telemetry::centralagent' do
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
:metering_secret => 'secrete', :metering_secret => 'secrete',
:use_syslog => true, :use_syslog => true,
:log_facility => 'LOG_LOCAL0' :log_facility => 'LOG_LOCAL0',
:log_dir => false
) )
should contain_class('ceilometer::agent::auth').with( should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete', :auth_password => 'secrete',

3
spec/classes/cloud_telemetry_server_spec.rb
View File

@@ -57,7 +57,8 @@ describe 'cloud::telemetry::server' do
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
:metering_secret => 'secrete', :metering_secret => 'secrete',
:use_syslog => true, :use_syslog => true,
:log_facility => 'LOG_LOCAL0' :log_facility => 'LOG_LOCAL0',
:log_dir => false
) )
should contain_class('ceilometer::agent::auth').with( should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete', :auth_password => 'secrete',