From a4f20d069ef002fe22b51cd954fec196954caa89 Mon Sep 17 00:00:00 2001
From: Mike Dorman <mdorman@godaddy.com>
Date: Thu, 18 Sep 2014 12:18:30 -0600
Subject: [PATCH] Stringify $evaluation_interval for validate_re call
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
---
Rakefile | 1 +
manifests/alarm/evaluator.pp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
index 4c2b2ed0..2e74217e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,3 +4,4 @@ require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_parameter_defaults')
+PuppetLint.configuration.send('disable_only_variable_string')
diff --git a/manifests/alarm/evaluator.pp b/manifests/alarm/evaluator.pp
index 26215349..c842feb1 100644
--- a/manifests/alarm/evaluator.pp
+++ b/manifests/alarm/evaluator.pp
@@ -22,7 +22,7 @@ class ceilometer::alarm::evaluator (
include ceilometer::params
- validate_re($evaluation_interval,'^(\d+)$')
+ validate_re("${evaluation_interval}",'^(\d+)$')
Ceilometer_config<||> ~> Service['ceilometer-alarm-evaluator']