diff --git a/CHANGELOG b/CHANGELOG index a2b963a..02195aa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Wed Jan 17 2024 Richard Gardner - 6.11.1 +- Updated hiera.yaml facts to support puppet 8 + * Mon Oct 23 2023 Steven Pritchard - 6.11.0 - [puppetsync] Add EL9 support diff --git a/hiera.yaml b/hiera.yaml index bca6cc3..7f0c4c4 100644 --- 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 index db18b2f..9a2be48 100644 --- 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",