openstack/puppet-ceilometer
Code Issues Proposed changes

Stringify $evaluation_interval for validate_re call

Browse Source 
Under Puppet 3.7.x, calls to validate_re fail if the parameter is not
strictly a string.  This change creates a string from
$evaluation_interval when passing to validate_re, so the call will
pass regardless of if the parameter to the class is specified as
string or an integer.

Change-Id: I17b82977f21483acf134837a66c5ecebe346cfdf
Closes-Bug: 1371235
This commit is contained in:
Mike Dorman 2014-09-18 12:18:30 -06:00
parent 957c2120d0
commit a4f20d069e
2 changed files with 2 additions and 1 deletions
Rakefile
manifests/alarm
evaluator.pp

1
Rakefile

@ -4,3 +4,4 @@ require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_parameter_defaults') PuppetLint.configuration.send('disable_class_parameter_defaults')
PuppetLint.configuration.send('disable_only_variable_string')

2
manifests/alarm/evaluator.pp

@ -22,7 +22,7 @@ class ceilometer::alarm::evaluator (
include ceilometer::params include ceilometer::params
validate_re($evaluation_interval,'^(\d+)$') validate_re("${evaluation_interval}",'^(\d+)$')
Ceilometer_config<||> ~> Service['ceilometer-alarm-evaluator'] Ceilometer_config<||> ~> Service['ceilometer-alarm-evaluator']