From 40dd359964753a159078fbfc2c44136f35da3857 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Tue, 11 Apr 2017 15:20:50 +0200 Subject: [PATCH] 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 --- modules/debian_org/templates/puppet.conf.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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] -- 2.20.1