Merge "Require valid polling_interval"
This commit is contained in:
@@ -136,7 +136,7 @@ class ceilometer::agent::polling (
|
||||
$resource_update_interval = $facts['os_service_default'],
|
||||
$resource_cache_expiry = $facts['os_service_default'],
|
||||
Boolean $manage_polling = false,
|
||||
$polling_interval = 300,
|
||||
Integer[1] $polling_interval = 300,
|
||||
Array[String[1]] $polling_meters = $ceilometer::params::polling_meters,
|
||||
Optional[Hash] $polling_config = undef,
|
||||
$cfg_file = $facts['os_service_default'],
|
||||
|
@@ -246,9 +246,11 @@ sources:
|
||||
|
||||
context 'with polling and basic custom settings' do
|
||||
before do
|
||||
params.merge!( :manage_polling => true,
|
||||
:polling_interval => 30,
|
||||
:polling_meters => ['meter1', 'meter2'] )
|
||||
params.merge!({
|
||||
:manage_polling => true,
|
||||
:polling_interval => 30,
|
||||
:polling_meters => ['meter1', 'meter2']
|
||||
})
|
||||
end
|
||||
|
||||
it { should contain_file('polling').with(
|
||||
|
Reference in New Issue
Block a user