Adding $puppetd_configtimeout

diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index f45c9ac1e41f79b6e33f120582634df220b9f946..267f2dce8624f61d8c866b96520776bb3a6199ef 100644 (file)
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -9,6 +9,10 @@ class puppetd inherits puppet {
     '': { $puppetd_runinterval = "3600" }
   }
 
+  case $puppetd_configtimeout {
+    '': { $puppetd_configtimeout = "120" }
+  }
+
   package { "puppet":
    ensure  => installed,
    require => Package["cron"],

diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index f8b1b32755d9cfed36e62a811e1af09f18a3a200..87f61fbbe9ad2a3838cddb2ea3b841a7d19f5b0e 100644 (file)
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -13,3 +13,4 @@ server        = puppet.<%= domain %>
 runinterval   = <%= puppetd_runinterval %>
 puppetport    = 8139
 masterport    = <%= puppetmaster_port %>
+configtimeout = <%= puppetd_configtimeout %>