From: Adam Boutcher <adam.j.boutcher@durham.ac.uk>
Date: Tue, 28 Sep 2021 15:27:44 +0000 (+0100)
Subject: Fedora 34 and iptables-compat fix, along with properly utilising iptables variable
X-Git-Tag: v3.3.0~4^2~1
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d677c5a32a1bfe80847e7897f758e9729565da41;p=puppet-modules%2Fpuppetlabs-firewall.git

Fedora 34 and iptables-compat fix, along with properly utilising iptables variable
---

diff --git a/manifests/linux.pp b/manifests/linux.pp
index 1ceadbe..d20430e 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -45,6 +45,7 @@ class firewall::linux (
   }
 
   package { 'iptables':
+    name   => $package_name,
     ensure => $pkg_ensure,
   }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index a6d1907..ac5171b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -16,7 +16,9 @@ class firewall::params {
         'Fedora': {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
-          if versioncmp($::operatingsystemrelease, '15') >= 0 {
+          if versioncmp($::operatingsystemrelease, '34') >= 0 {
+            $package_name = 'iptables-compat'
+          } elsif versioncmp($::operatingsystemrelease, '15') >= 0 {
             $package_name = 'iptables-services'
           } else {
             $package_name = undef