Merge pull request #1018 from adamboutcher/fedora34

Fedora 34 and iptables-compat fix; properly utilising iptables param.

Author: adrianiurca

manifests/linux.pp

@@ -31,6 +31,7 @@
   $service_name_v6 = $firewall::params::service_name_v6,
   $package_name    = $firewall::params::package_name,
   $ebtables_manage = false,
+  $iptables_name   = $firewall::params::iptables_name,
 ) inherits ::firewall::params {
   $enable = $ensure ? {
     'running' => true,
@@ -45,6 +46,7 @@
   }
 
   package { 'iptables':
+    name   => $iptables_name,
     ensure => $pkg_ensure,
   }
 

manifests/params.pp

@@ -11,14 +11,20 @@
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
           $package_name = undef
+          $iptables_name = 'iptables'
           $sysconfig_manage = true
         }
         'Fedora': {
           $service_name = 'iptables'
           $service_name_v6 = 'ip6tables'
-          if versioncmp($::operatingsystemrelease, '15') >= 0 {
+          if versioncmp($::operatingsystemrelease, '34') >= 0 {
             $package_name = 'iptables-services'
+            $iptables_name = 'iptables-compat'
+          } elsif versioncmp($::operatingsystemrelease, '15') >= 0 {
+            $package_name = 'iptables-services'
+            $iptables_name = 'iptables'
           } else {
+            $iptables_name = 'iptables'
             $package_name = undef
           }
           $sysconfig_manage = true
@@ -28,23 +34,27 @@
             $service_name = ['iptables', 'nftables']
             $service_name_v6 = 'ip6tables'
             $package_name = ['iptables-services', 'nftables']
+            $iptables_name = 'iptables'
             $sysconfig_manage = false
           } elsif versioncmp($::operatingsystemrelease, '7.0') >= 0 {
             $service_name = 'iptables'
             $service_name_v6 = 'ip6tables'
             $package_name = 'iptables-services'
+            $iptables_name = 'iptables'
             $sysconfig_manage = true
           } else {
             $service_name = 'iptables'
             $service_name_v6 = 'ip6tables'
             $package_name = 'iptables-ipv6'
+            $iptables_name = 'iptables'
             $sysconfig_manage = true
           }
         }
       }
     }
     'Debian': {
       $service_name_v6 = undef
+      $iptables_name = 'iptables'
       case $::operatingsystem {
         'Debian': {
           if versioncmp($::operatingsystemrelease, 'unstable') >= 0 {
@@ -79,6 +89,7 @@
       $package_name = 'net-firewall/iptables'
     }
     default: {
+      $iptables_name = 'iptables'
       $service_name_v6 = undef
       case $::operatingsystem {
         'Archlinux': {