diff options
| author | Fredrik Thulin <fredrik@thulin.net> | 2014-10-03 14:29:32 +0200 |
|---|---|---|
| committer | Fredrik Thulin <fredrik@thulin.net> | 2014-10-03 14:29:32 +0200 |
| commit | 2fbbba1b3fea02300e2c23b02304b57bd6bb6dc5 (patch) | |
| tree | beaffcd1da98b74081ccc460fb43e35bf97d30cd /global | |
| parent | 399e279d504420a391db509ecb09db022cf78032 (diff) | |
add config_version so Puppet picks up Cosmos tag namesunet-ops-2014-10-03-v02
Diffstat (limited to 'global')
| -rwxr-xr-x | global/overlay/etc/puppet/cosmos_config_version | 11 | ||||
| -rw-r--r-- | global/overlay/etc/puppet/puppet.conf | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/cosmos_config_version b/global/overlay/etc/puppet/cosmos_config_version new file mode 100755 index 0000000..57786fd --- /dev/null +++ b/global/overlay/etc/puppet/cosmos_config_version @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +set -a +COSMOS_CONF_DIR="/etc/cosmos" +. /etc/cosmos/cosmos.conf +COSMOS_VERBOSE="yes" +set +a + +/etc/cosmos/update.d/25verify-git 2>/dev/null | grep ^"tag " | head -1 | cut -b 5- diff --git a/global/overlay/etc/puppet/puppet.conf b/global/overlay/etc/puppet/puppet.conf index ec11255..bb8cee6 100644 --- a/global/overlay/etc/puppet/puppet.conf +++ b/global/overlay/etc/puppet/puppet.conf @@ -8,7 +8,10 @@ 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/modules:/etc/puppet/cosmos-modules:/usr/share/puppet/modules +config_version = /etc/puppet/cosmos_config_version [master] # These are needed when the puppetmaster is run by passenger |