From c81cca723c1b506ec9e2f8b9749fa78b9e14c8b3 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 27 Sep 2025 23:04:35 +0900 Subject: [PATCH] Require valid polling_interval Change-Id: Idd60111074d918c826cb51287e640b58deca62bd Signed-off-by: Takashi Kajinami --- manifests/agent/polling.pp | 2 +- spec/classes/ceilometer_agent_polling_spec.rb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp index 4be32167..226aa386 100644 --- a/manifests/agent/polling.pp +++ b/manifests/agent/polling.pp @@ -142,7 +142,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'], diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb index 634e69e4..35afb206 100644 --- a/spec/classes/ceilometer_agent_polling_spec.rb +++ b/spec/classes/ceilometer_agent_polling_spec.rb @@ -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(