summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/puppetd.pp4
-rw-r--r--templates/puppet-node.conf.erb1
2 files changed, 5 insertions, 0 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index f45c9ac..267f2dc 100644
--- 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 f8b1b32..87f61fb 100644
--- 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 %>