From a7b65b95fa146f2174cdfa6d2fa73714f9824ca0 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Tue, 10 Sep 2024 12:34:52 -0500 Subject: [PATCH] [puppetsync] Support simp-iptables 7.x Update module dependencies to support simp-iptables 7.x. --- CHANGELOG | 3 +++ metadata.json | 19 ++++++++++++------- spec/spec_helper.rb | 1 - 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f0bc504..a0e77cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Tue Sep 10 2024 Steven Pritchard - 7.5.0 +- [puppetsync] Add EL9 support + * Wed Oct 11 2023 Steven Pritchard - 7.4.0 - [puppetsync] Updates for Puppet 8 - These updates may include the following: diff --git a/metadata.json b/metadata.json index 20a9103..f046df1 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-simp_apache", - "version": "7.4.0", + "version": "7.5.0", "author": "SIMP Team", "summary": "configure SIMP apache & component sites (NOTE: legacy, conflicts with puppetlabs-apache)", "license": "Apache-2.0", @@ -19,7 +19,7 @@ }, { "name": "simp/iptables", - "version_requirement": ">= 6.5.3 < 7.0.0" + "version_requirement": ">= 6.5.3 < 8.0.0" }, { "name": "simp/logrotate", @@ -55,33 +55,38 @@ "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "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 1b21aa4..ef4fe64 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')