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

diff --git a/manifests/linux.pp b/manifests/linux.pp
index 1ceadbe51024407b764e1cbce9acbf6ead0795b9..d20430eb967a40fc1434c683c205efd4e78dc8ee 100644 (file)
--- 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 a6d1907f35a624fd07a1c6dba8dd60ea950a71a1..ac5171b5bf8508b911991f1c3a534bc035823505 100644 (file)
--- 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