From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 11 Apr 2017 13:20:50 +0000 (+0200)
Subject: puppet.conf: do not set pluginsync=true on stretch hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=40dd359964753a159078fbfc2c44136f35da3857;p=mirror%2Fdsa-puppet.git

puppet.conf: do not set pluginsync=true on stretch hosts

pluginsync has been deprecated in puppet version 4.4.0. It is however
the default, so it can be safely removed from the configuration file.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index e0947269e..83d06dec2 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -9,9 +9,11 @@ vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
-pluginsync=true
 # This is the default environment for all clients
 environment=production
+<%- if has_variable?("puppetversion") and (scope.call_function('versioncmp', [@puppetversion.to_s, '4.4.0']) < 0) -%>
+pluginsync=true
+<%- end -%>
 
 <% if scope.function_has_role(['puppetmaster']) %>
 [master]