X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=hiera.yaml;h=545fff32722a61409075e87fd0003fd8b2d01f5f;hb=refs%2Fheads%2Frelease-prep;hp=4bfe502a4a4aa407e7f2b66617b0511feb52daf8;hpb=42637245f33087cb698eaed07623b5a9eafeb780;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/hiera.yaml b/hiera.yaml
index 4bfe502..545fff3 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -1,22 +1,21 @@
 ---
-version: 4
-datadir: data
-hierarchy:
-  - name: "Full Version"
-    backend: yaml
-    path: "%{facts.os.name}-%{facts.os.release.full}"
-
-  - name: "Major Version"
-    backend: yaml
-    path: "%{facts.os.name}-%{facts.os.release.major}"
+version: 5
 
-  - name: "Distribution Name"
-    backend: yaml
-    path: "%{facts.os.name}"
+defaults:  # Used for any hierarchy level that omits these keys.
+  datadir: data         # This path is relative to hiera.yaml's directory.
+  data_hash: yaml_data  # Use the built-in YAML backend.
 
-  - name: "Operating System Family"
-    backend: yaml
-    path: "%{facts.os.family}"
-
-  - name: "common"
-    backend: yaml
+hierarchy:
+  - name: "osfamily/major release"
+    paths:
+        # Used to distinguish between Debian and Ubuntu
+      - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
+      - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
+        # Used for Solaris
+      - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
+  - name: "osfamily"
+    paths:
+      - "os/%{facts.os.name}.yaml"
+      - "os/%{facts.os.family}.yaml"
+  - name: 'common'
+    path: 'common.yaml'