Add check for puppet version before setting ordering setting in agent.pp

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

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