summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2014-10-17 10:35:31 +0200
committerLeif Johansson <leifj@sunet.se>2014-10-17 10:35:31 +0200
commit03f11e934ce69baa884f941dcd3a286183425f53 (patch)
treedc4151ba5e4433822330b67840790d0f9a4d2cf4
parentf1338441f14d173227a40277fdbd86cfbe7a9061 (diff)
parent2fbbba1b3fea02300e2c23b02304b57bd6bb6dc5 (diff)
Merge branch 'master' of git.nordu.net:sunet-ops
-rwxr-xr-xglobal/overlay/etc/puppet/cosmos_config_version11
-rw-r--r--global/overlay/etc/puppet/puppet.conf3
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