Merge branch 'master' of https://github.com/gigawhat/puppetmodule into gigawhat-master

Author: Stephen

manifests/agent.pp

@@ -18,6 +18,7 @@
 #   ['pluginsync']            - Whethere to have pluginsync
 #   ['use_srv_records']       - Whethere to use srv records
 #   ['srv_domain']            - Domain to request the srv records
+#   ['ordering']              - The way the agent processes resources. New feature in puppet 3.3.0
 #
 # Actions:
 # - Install and configures the puppet agent
@@ -47,7 +48,8 @@
   $report                 = true,
   $pluginsync             = true,
   $use_srv_records        = false,
-  $srv_domain             = undef
+  $srv_domain             = undef,
+  $ordering               = undef
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -186,6 +188,19 @@
     }
   }
 
+  if (($ordering) and ($::puppetversion < '3.3.0'))
+  {
+    fail('ordering requires puppet verions 3.3.0 or greater')
+  }
+  elsif (($ordering) and ($::puppetversion >= '3.3.0'))
+  {
+    ini_setting {'puppetagentordering':
+      ensure  => present,
+      setting => 'ordering',
+      value   => $ordering,
+    }
+  }
+
   ini_setting {'puppetagentenvironment':
     ensure  => present,
     setting => 'environment',