From 0660e9c697bdfd6c95e8f070c39c053edf8a002f Mon Sep 17 00:00:00 2001 From: Rick Gardner Date: Wed, 17 Jan 2024 13:11:44 -0500 Subject: [PATCH] updated hiera.yml facts to work with puppet 8 (#107) * updated hiera.yml facts to work with puppet 8 * Bumped .z ver Fixes #105 --------- Co-authored-by: Rick Gardner --- CHANGELOG | 3 +++ hiera.yaml | 6 +++--- metadata.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 00b07e1..64adc02 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Wed Jan 17 2024 Richard Gardner - 6.9.1 +- Updated hiera.yaml facts to support puppet 8 + * Mon Oct 23 2023 Steven Pritchard - 6.9.0 - [puppetsync] Add EL9 support diff --git a/hiera.yaml b/hiera.yaml index 7f744ef..0cd830d 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -5,11 +5,11 @@ defaults: data_hash: yaml_data hierarchy: - 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: "OSFamily" - path: "os/%{facts.osfamily}.yaml" + path: "os/%{facts.os.family}.yaml" - name: "Kernel" path: "os/%{facts.kernel}.yaml" - name: "Common" diff --git a/metadata.json b/metadata.json index c7ee4e3..f8a9f16 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-rsync", - "version": "6.9.0", + "version": "6.9.1", "author": "SIMP Team", "summary": "manage an rsync server, secured by stunnel", "license": "Apache-2.0",