Merge branch 'redstonemercury-master'

Author: stephenrjohnson

manifests/agent.pp

@@ -60,6 +60,7 @@
   $listen                 = false,
   $reportserver           = '$server',
   $digest_algorithm       = $::puppet::params::digest_algorithm,
+  $configtimeout          = '2m',
 ) inherits puppet::params {
 
   if ! defined(User[$::puppet::params::puppet_user]) {
@@ -303,4 +304,9 @@
       section => 'main',
     }
   }
+  ini_setting {'puppetagentconfigtimeout':
+    ensure  => present,
+    setting => 'configtimeout',
+    value   => $configtimeout,
+  }
 }