From 4b275630e95cffe4ffce17465eabfb4a0bd0b7ef Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 16 Oct 2016 09:22:40 +0200 Subject: [PATCH] move deprecated modulepath so it is only set on the master --- modules/debian-org/templates/puppet.conf.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb index f748c02c6..8b7580026 100644 --- a/modules/debian-org/templates/puppet.conf.erb +++ b/modules/debian-org/templates/puppet.conf.erb @@ -10,11 +10,12 @@ ssldir=/var/lib/puppet/ssl rundir=/var/run/puppet factpath=$vardir/lib/facter pluginsync=true -modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules # This is the default environment for all clients environment=production <%- if scope.lookupvar('::hostname') == 'handel' -%> +modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules + [master] environments = production,staging reports = store -- 2.20.1