diff options
author | Fredrik Thulin <fredrik@thulin.net> | 2014-02-25 09:33:32 +0100 |
---|---|---|
committer | Fredrik Thulin <fredrik@thulin.net> | 2014-02-25 09:33:32 +0100 |
commit | a9a96696eee9cee87ef03ed7daf9df34bbc6c7b5 (patch) | |
tree | fc5b90a8201835da243454b1c6a088085dc66af0 /global/overlay/etc/puppet/puppet.conf | |
parent | 297537d0a96b712fb997d14a2150911dd047c964 (diff) | |
parent | 8d2f9cc27ca9af1c16f7aa9597a93de00ed0ae2e (diff) |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2014-02-25-v01
Diffstat (limited to 'global/overlay/etc/puppet/puppet.conf')
-rw-r--r-- | global/overlay/etc/puppet/puppet.conf | 1 |
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 |