From 0e80378565759412bf4e0a740397cf7f44ba31bd Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@sicura.us>
Date: Tue, 10 Sep 2024 13:40:41 -0500
Subject: [PATCH] [puppetsync] Support simp-iptables 7.x

Update module dependencies to support simp-iptables 7.x.
---
 CHANGELOG           |  3 +++
 metadata.json       | 27 ++++++++++++++++-----------
 spec/spec_helper.rb |  1 -
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a2eb97b5..f650ffd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+* Tue Sep 10 2024 Steven Pritchard <steve@sicura.us> - 4.23.0
+- [puppetsync] Add EL9 support
+
 * Tue Jul 09 2024 Mike Riddle <mike@sicura.us> - 4.22.0
 - Added ability for users to switch between '/bin/true' and '/bin/false' when disabling kernel modules via the kmod_blacklist class
 
diff --git a/metadata.json b/metadata.json
index c805a5c9..6c874fb7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "simp-simp",
-  "version": "4.22.0",
+  "version": "4.23.0",
   "author": "SIMP Team",
   "summary": "default profiles for core SIMP installations",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
     },
     {
       "name": "puppetlabs/puppetdb",
-      "version_requirement": ">= 7.1.0 < 8.0.0"
+      "version_requirement": ">= 7.1.0 < 9.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
@@ -41,7 +41,7 @@
     },
     {
       "name": "saz/timezone",
-      "version_requirement": ">= 5.1.1 < 7.0.0"
+      "version_requirement": ">= 5.1.1 < 8.0.0"
     },
     {
       "name": "simp/aide",
@@ -85,7 +85,7 @@
     },
     {
       "name": "simp/iptables",
-      "version_requirement": ">= 6.5.3 < 7.0.0"
+      "version_requirement": ">= 6.5.3 < 8.0.0"
     },
     {
       "name": "simp/issue",
@@ -97,7 +97,7 @@
     },
     {
       "name": "simp/pam",
-      "version_requirement": ">= 6.8.3 < 7.0.0"
+      "version_requirement": ">= 6.8.3 < 8.0.0"
     },
     {
       "name": "simp/polkit",
@@ -185,7 +185,7 @@
     },
     {
       "name": "simp/useradd",
-      "version_requirement": ">= 0.2.2 < 1.0.0"
+      "version_requirement": ">= 0.2.2 < 2.0.0"
     },
     {
       "name": "puppet/nsswitch",
@@ -203,21 +203,24 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
@@ -237,13 +240,15 @@
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     }
   ]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1b21aa4d..ef4fe640 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -100,7 +100,6 @@ def set_hieradata(hieradata)
   c.mock_with :rspec
 
   c.module_path = File.join(fixture_path, 'modules')
-  c.manifest_dir = File.join(fixture_path, 'manifests') if c.respond_to?(:manifest_dir)
 
   c.hiera_config = File.join(fixture_path, 'hieradata', 'hiera.yaml')