diff options
| author | mail_redacted_for_web | 2017-11-15 09:24:40 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2017-11-15 09:24:40 -0800 |
| commit | 7264b63d10ca828aff611d94aa730cc5451a7a5c (patch) | |
| tree | e2f9ea54d4a8b952fb40b877622aa251e9182a38 | |
| parent | 05d76209621179034a1ef67a413f4f45ce0970f8 (diff) | |
| download | control-repo-template-7264b63d10ca828aff611d94aa730cc5451a7a5c.tar.bz2 | |
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.
| -rw-r--r-- | data/common.yaml (renamed from hieradata/common.yaml) | 0 | ||||
| -rw-r--r-- | data/nodes/example-node.yaml (renamed from hieradata/nodes/example-node.yaml) | 0 | ||||
| -rw-r--r-- | hiera.yaml | 12 |
3 files changed, 12 insertions, 0 deletions
diff --git a/hieradata/common.yaml b/data/common.yaml index 2baa62b..2baa62b 100644 --- a/hieradata/common.yaml +++ b/data/common.yaml diff --git a/hieradata/nodes/example-node.yaml b/data/nodes/example-node.yaml index ed97d53..ed97d53 100644 --- a/hieradata/nodes/example-node.yaml +++ b/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' |