fix puppet version check when setting agent ordering

josh keife · josh keife · commit 860ae8b52d86 · 2014-04-02T20:39:33.000-06:00
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -188,11 +188,11 @@
     }
   }
 
-  if (($ordering == true) and (${::puppetversion} < '3.3.0'))
+  if (($ordering) and ($::puppetversion < '3.3.0'))
   {
-    fail("ordering requires puppet verions 3.3.0 or greater")
+    fail('ordering requires puppet verions 3.3.0 or greater')
   }
-  elsif (($ordering == true) and (${::puppetversion} >= '3.3.0'))
+  elsif (($ordering) and ($::puppetversion >= '3.3.0'))
   {
     ini_setting {'puppetagentordering':
       ensure  => present,

Original file line number	Diff line number	Diff line change
`@@ -188,11 +188,11 @@`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`191`		`- if (($ordering == true) and (${::puppetversion} < '3.3.0'))`
	`191`	`+ if (($ordering) and ($::puppetversion < '3.3.0'))`
`192`	`192`	`{`
`193`		`- fail("ordering requires puppet verions 3.3.0 or greater")`
	`193`	`+ fail('ordering requires puppet verions 3.3.0 or greater')`
`194`	`194`	`}`
`195`		`- elsif (($ordering == true) and (${::puppetversion} >= '3.3.0'))`
	`195`	`+ elsif (($ordering) and ($::puppetversion >= '3.3.0'))`
`196`	`196`	`{`
`197`	`197`	`ini_setting {'puppetagentordering':`
`198`	`198`	`ensure => present,`