diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-06-03 20:18:11 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-06-03 20:18:11 -0300 |
| commit | 10d8c936c907fda3460d55ddd5af40f13541946d (patch) | |
| tree | edfa4d836ab327b781ade0ba848f93365ac3b46c | |
| parent | a3b6309a68d4a3300750c1bf8a7ebea7f302bfa2 (diff) | |
| download | puppet-puppet-10d8c936c907fda3460d55ddd5af40f13541946d.tar.gz puppet-puppet-10d8c936c907fda3460d55ddd5af40f13541946d.tar.bz2 | |
Adding $puppetd_configtimeout
| -rw-r--r-- | manifests/puppetd.pp | 4 | ||||
| -rw-r--r-- | templates/puppet-node.conf.erb | 1 |
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 %> |