openstack/puppet-ceilometer
Code Issues Proposed changes

Merge "Require valid polling_interval"

Browse Source
This commit is contained in:
Zuul
2025-09-29 15:49:29 +00:00
committed by Gerrit Code Review
parent f633cefe93 c81cca723c
commit 5abf951b35
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent/polling.pp
View File

@@ -136,7 +136,7 @@ class ceilometer::agent::polling (
$resource_update_interval = $facts['os_service_default'], $resource_update_interval = $facts['os_service_default'],
$resource_cache_expiry = $facts['os_service_default'], $resource_cache_expiry = $facts['os_service_default'],
Boolean $manage_polling = false, Boolean $manage_polling = false,
$polling_interval = 300, Integer[1] $polling_interval = 300,
Array[String[1]] $polling_meters = $ceilometer::params::polling_meters, Array[String[1]] $polling_meters = $ceilometer::params::polling_meters,
Optional[Hash] $polling_config = undef, Optional[Hash] $polling_config = undef,
$cfg_file = $facts['os_service_default'], $cfg_file = $facts['os_service_default'],

6
spec/classes/ceilometer_agent_polling_spec.rb
View File

@@ -246,9 +246,11 @@ sources:
context 'with polling and basic custom settings' do context 'with polling and basic custom settings' do
before do before do
params.merge!( :manage_polling => true, params.merge!({
:manage_polling => true,
:polling_interval => 30, :polling_interval => 30,
:polling_meters => ['meter1', 'meter2'] ) :polling_meters => ['meter1', 'meter2']
})
end end
it { should contain_file('polling').with( it { should contain_file('polling').with(