Herron has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/398484 )
Change subject: puppet.conf: replace configtimeout ...................................................................... puppet.conf: replace configtimeout configtimeout is deprecated in puppet 4, replaced with http_connect_timeout and http_read_timeout. This patch sets configtimeout to 60 (because we should really always have connectivity with our puppet master) and http_read_timeout to 960 (the previous setting of configtimeout) because sometimes files are big. Bug: T182585 Change-Id: Ib602d0e76113a445189990807b18def4570cddce --- M modules/base/templates/puppet.conf.d/10-main.conf.erb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Herron: Looks good to me, approved Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb b/modules/base/templates/puppet.conf.d/10-main.conf.erb index ca8d341..6a62c3e 100644 --- a/modules/base/templates/puppet.conf.d/10-main.conf.erb +++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb @@ -21,7 +21,8 @@ <% if @certname %>certname = <%= @certname %><% end %> <% if @dns_alt_names %>dns_alt_names = <%= @dns_alt_names %><% end %> daemonize = false -configtimeout = 960 +http_connect_timeout = 60 +http_read_timeout = 960 usecacheonfailure = false splay = true pluginsync = true -- To view, visit https://gerrit.wikimedia.org/r/398484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib602d0e76113a445189990807b18def4570cddce Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Herron <kher...@wikimedia.org> Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org> Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
