diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-02-24 11:19:10 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-02-24 11:19:10 +0100 |
| commit | e2cc0bc80fa8cfab7fecb04677a45a4f51cb561e (patch) | |
| tree | 09d540d53a1d9fa49fea52d4b1339d7a51846ac4 /global/overlay/etc/puppet | |
| parent | c3415f304e2f11bdbf153bdb8e810e89311fc7a4 (diff) | |
| parent | 7863ad617033064d6b5758d3d1f4bba32b9cc5dd (diff) | |
merge multiversesunet-ops-2015-02-24-v01
Diffstat (limited to 'global/overlay/etc/puppet')
| -rw-r--r-- | global/overlay/etc/puppet/cosmos-modules.conf | 7 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/hiera.yaml | 1 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/puppet.conf | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index d3d00d5..80c0216 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -1,4 +1,3 @@ -# # name source (puppetlabs fq name or git url) upgrade (yes/no) # concat git://github.com/SUNET/puppetlabs-concat.git yes sunet-* @@ -8,17 +7,11 @@ ufw git://github.com/SUNET/puppet-module-ufw.git yes sunet-* apt git://github.com/SUNET/puppetlabs-apt.git no sunet-* vcsrepo git://github.com/SUNET/puppetlabs-vcsrepo.git no sunet-* xinetd git://github.com/SUNET/puppetlabs-xinetd.git no sunet-* -#golang elithrar/golang yes python git://github.com/SUNET/puppet-python.git yes sunet-* hiera-gpg git://github.com/SUNET/hiera-gpg.git no sunet-* -#epel git://github.com/SUNET/puppet-module-epel.git yes sunet-* -#erlang git://github.com/SUNET/garethr-erlang.git yes sunet-* -#rabbitmq git://github.com/SUNET/puppetlabs-rabbitmq.git yes sunet-* pound git://github.com/SUNET/puppet-pound.git yes sunet-* augeas git://github.com/SUNET/puppet-augeas.git yes sunet-* bastion git://github.com/SUNET/puppet-bastion.git yes sunet-* -#wordpress hunner/wordpress no -#mysql puppetlabs/mysql no apache puppetlabs/apache no pyff git://github.com/samlbits/puppet-pyff.git yes puppet-pyff-* postgresql git://github.com/SUNET/puppetlabs-postgresql.git yes sunet-* diff --git a/global/overlay/etc/puppet/hiera.yaml b/global/overlay/etc/puppet/hiera.yaml index 782fa7f..3663305 100644 --- a/global/overlay/etc/puppet/hiera.yaml +++ b/global/overlay/etc/puppet/hiera.yaml @@ -8,6 +8,7 @@ :hierarchy: - "%{env}/%{location}/%{calling_module}" - "%{env}/%{calling_module}" + - local - secrets.yaml - common diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf index 64452eb..ec11255 100644 --- a/global/overlay/etc/puppet/puppet.conf +++ b/global/overlay/etc/puppet/puppet.conf @@ -8,11 +8,7 @@ rundir=/var/run/puppet factpath=/etc/puppet/facter node_terminus = exec external_nodes = /etc/puppet/cosmos_enc.py -# We must add /etc/puppet/cosmos-modules to basemodulepath in order for Puppet to find -# the hiera-gpg backend. If the backend isn't found - *everything* breaks. Puppet 3.7.1. -basemodulepath = /etc/puppet/cosmos-modules:/etc/puppet/modules:/usr/share/puppet/modules -#modulepath = /etc/puppet/cosmos-modules:/etc/puppet/modules:/usr/share/puppet/modules -#config_version = /etc/puppet/cosmos_config_version +basemodulepath = /etc/puppet/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules [master] # These are needed when the puppetmaster is run by passenger |