From: Aurelien Jarno Date: Tue, 11 Apr 2017 13:27:40 +0000 (+0200) Subject: puppet.conf: split configtimeout into http_connect_timeout and http_read_timeout... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7a1fb7dbb49b61b9d949e58ca92774f2d49c4e7e;p=mirror%2Fdsa-puppet.git puppet.conf: split configtimeout into http_connect_timeout and http_read_timeout on stretch hosts configtimeout has been deprecated in puppet version 4.1.0. It has been split into http_connect_timeout and http_read_timeout. The former controls how long Puppet should attempt to make a connection and the latter controls how long Puppet should allow transfers to continue. Signed-off-by: Aurelien Jarno --- diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb index 83d06dec2..f6616ed6d 100644 --- a/modules/debian_org/templates/puppet.conf.erb +++ b/modules/debian_org/templates/puppet.conf.erb @@ -26,7 +26,12 @@ storeconfigs_backend = puppetdb [agent] environments = development,testing,production,staging report = true +<%- if has_variable?("puppetversion") and (scope.call_function('versioncmp', [@puppetversion.to_s, '4.1.0']) >= 0) -%> +http_connect_timeout = 10 +http_read_timeout = 240 +<%- else -% configtimeout = 240 +<%- end -%> <%- if has_variable?("puppetversion") and @puppetversion.to_s == "3.7.2" -%> stringify_facts = false <%- end -%>