summaryrefslogtreecommitdiff
path: root/global/overlay/etc/puppet
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-12-19 23:46:56 +0100
committerLeif Johansson <leifj@sunet.se>2013-12-19 23:46:56 +0100
commitc13d12887522c80632244caa868c5566742b1f45 (patch)
tree777d94662a8b878d0e82942529bfe700207eea2b /global/overlay/etc/puppet
parent33fcb54bedbbc4c6b86829c4d90f487d9f1e679d (diff)
parentf1c2ae2e0495f279493d8989b1c72bf3f8ed122a (diff)
merge multiverse to get hierasunet-ops-2013-12-19-v04
Diffstat (limited to 'global/overlay/etc/puppet')
-rw-r--r--global/overlay/etc/puppet/cosmos-modules.conf1
-rw-r--r--global/overlay/etc/puppet/hiera.yaml18
2 files changed, 19 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf
index 3c5a585..b0a91f4 100644
--- a/global/overlay/etc/puppet/cosmos-modules.conf
+++ b/global/overlay/etc/puppet/cosmos-modules.conf
@@ -11,3 +11,4 @@ xinetd puppetlabs/xinetd no
golang elithrar/golang yes
python git://github.com/stankevich/puppet-python.git yes
dhcp git://github.com/SUNET/puppetlabs-dhcp yes
+hiera-gpg git://github.com/SUNET/hiera-gpg.git no
diff --git a/global/overlay/etc/puppet/hiera.yaml b/global/overlay/etc/puppet/hiera.yaml
index e69de29..cd619bb 100644
--- a/global/overlay/etc/puppet/hiera.yaml
+++ b/global/overlay/etc/puppet/hiera.yaml
@@ -0,0 +1,18 @@
+---
+:backends: - yaml
+ - gpg
+
+:logger: console
+
+:hierarchy: - %{env}/%{location}/%{calling_module}
+ - %{env}/%{calling_module}
+ - secrets.yaml
+ - common
+
+
+:yaml:
+ :datadir: /etc/hiera/data
+
+:gpg:
+ :datadir: /etc/hiera/data
+ :key_dir: /etc/hiera/gpg