From 7264b63d10ca828aff611d94aa730cc5451a7a5c Mon Sep 17 00:00:00 2001
From: Reid Vandewiele <reid@puppetlabs.com>
Date: Wed, 15 Nov 2017 09:24:40 -0800
Subject: [PATCH] Enable Hiera 5

This commit enables the control repo to use Hiera 5 environment-level
hiera hierarchy. This means adding a hiera.yaml to the repo, and moving
hieradata/ => data/.

We should do this to the control-repo template new customers base off of
because in a Hiera 5 world, the global hiera.yaml should be very minimal
(possibly even ONLY having the console level), and everything else
(nodes, common) belongs in the environment hiera.yaml.

This control-repo template is how people start using Puppet. It should
reflect using our most modern technologies.
---
 {hieradata => data}/common.yaml             |  0
 {hieradata => data}/nodes/example-node.yaml |  0
 hiera.yaml                                  | 12 ++++++++++++
 3 files changed, 12 insertions(+)
 rename {hieradata => data}/common.yaml (100%)
 rename {hieradata => data}/nodes/example-node.yaml (100%)
 create mode 100644 hiera.yaml

diff --git a/hieradata/common.yaml b/data/common.yaml
similarity index 100%
rename from hieradata/common.yaml
rename to data/common.yaml
diff --git a/hieradata/nodes/example-node.yaml b/data/nodes/example-node.yaml
similarity index 100%
rename from hieradata/nodes/example-node.yaml
rename to data/nodes/example-node.yaml
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 0000000..912ba45
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,12 @@
+---
+version: 5
+
+defaults:
+  datadir: "data"
+
+hierarchy:
+  - name: 'Yaml backend'
+    data_hash: yaml_data
+    paths:
+      - "nodes/%{trusted.certname}.yaml"
+      - 'common.yaml'