updated hiera.yml facts to work with puppet 8 (#110)

* updated hiera.yml facts to work with puppet 8 * Bumped .z ver Fixes #107 --------- Co-authored-by: Rick Gardner <[email protected]>
simp · Jan 17, 2024 · 741cd35 · 741cd35
1 parent 94d9c6f
commit 741cd35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Wed Jan 17 2024 Richard Gardner <[email protected]> - 6.11.1
+- Updated hiera.yaml facts to support puppet 8
+
 * Mon Oct 23 2023 Steven Pritchard <[email protected]> - 6.11.0
 - [puppetsync] Add EL9 support
 

diff --git a/hiera.yaml b/hiera.yaml
@@ -5,13 +5,13 @@ defaults:
   data_hash: yaml_data
 hierarchy:
   - name: "fips_enabled OS + Release"
-    path: "fips_enabled/is_%{facts.fips_enabled}/os/%{facts.operatingsystem}-%{facts.operatingsystemmajrelease}.yaml"
+    path: "fips_enabled/is_%{facts.fips_enabled}/os/%{facts.os.name}-%{facts.os.release.major}.yaml"
   - name: "fips_enabled"
     path: "fips_enabled/is_%{facts.fips_enabled}.yaml"
   - name: "OS + Release"
-    path: "os/%{facts.operatingsystem}-%{facts.operatingsystemmajrelease}.yaml"
+    path: "os/%{facts.os.name}-%{facts.os.release.major}.yaml"
   - name: "OS"
-    path: "os/%{facts.operatingsystem}.yaml"
+    path: "os/%{facts.os.name}.yaml"
   - name: "Kernel"
     path: "os/%{facts.kernel}.yaml"
   - name: "Common"

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-aide",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "author": "SIMP Team",
   "summary": "manages AIDE",
   "license": "Apache-2.0",