summaryrefslogtreecommitdiff
path: root/global/overlay/etc
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-02-21 22:14:50 +0100
committerLeif Johansson <leifj@sunet.se>2014-02-21 22:14:50 +0100
commitbbe5b3c12584b3808e5e272cf8100ca159f937e4 (patch)
treeee4e7f8e123c4ddd8fd3750344a8802b761ef10d /global/overlay/etc
parenta88fd0a34f283ebb534a9353beb7d30ec450543a (diff)
parent45e2a1c1defacb2034c877b71fcf50e961214e72 (diff)
Merge branch 'multiverse'
Diffstat (limited to 'global/overlay/etc')
-rw-r--r--global/overlay/etc/puppet/puppet.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf
index 0ba85f4..a269892 100644
--- a/global/overlay/etc/puppet/puppet.conf
+++ b/global/overlay/etc/puppet/puppet.conf
@@ -7,6 +7,7 @@ factpath=$vardir/lib/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
[master]
# These are needed when the puppetmaster is run by passenger