summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-09-29 14:04:44 +0200
committerLeif Johansson <leifj@sunet.se>2014-09-29 14:04:44 +0200
commit359ceabd4a18b316bd2052b020c886b3db9646ec (patch)
treefbe0c31d5362a6e720c7523004a453ba9637d821
parent171fbc8356011fa66fb65956b425b02bf14e6a34 (diff)
-rw-r--r--global/overlay/etc/puppet/puppet.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf
index 96f7b44..7efe486 100644
--- a/global/overlay/etc/puppet/puppet.conf
+++ b/global/overlay/etc/puppet/puppet.conf
@@ -6,7 +6,6 @@ rundir=/var/run/puppet
# factpath is supposed to be colon-delimeted, but that does not appear to work
# (tested with 'strace -f facter --puppet something' - does not split on colon in Puppet 3.4.2).
factpath=/etc/puppet/facter
-templatedir=$confdir/templates
node_terminus = exec
external_nodes = /etc/puppet/cosmos_enc.py
modulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules