telemetry: update log params to master

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-26 15:06:40 +01:00
parent b4683ded87
commit bf84617285
3 changed files with 8 additions and 11 deletions

View File

@ -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':

View File

@ -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

View File

@ -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