meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-updates-for-poky-stx.patch

   1 diff -ru a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
   2 --- a/lib/puppet/util/firewall.rb       2020-03-05 19:13:11.474497464 +0800
   3 +++ b/lib/puppet/util/firewall.rb       2020-03-05 19:18:52.030506745 +0800
   4 @@ -154,6 +154,8 @@
   5        'RedHat'
   6      when 'Debian', 'Ubuntu'
   7        'Debian'
   8 +    when 'poky-stx'
   9 +      'Debian_poky-stx'
  10      else
  11        Facter.value(:operatingsystem)
  12      end
  13 @@ -208,7 +210,7 @@
  14        when :IPv4
  15          ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
  16        end
  17 -    when :Archlinux
  18 +    when :Archlinux, :Debian_poky-stx
  19        case proto.to_sym
  20        when :IPv4
  21          ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
  22 diff -ru a/manifests/params.pp b/manifests/params.pp
  23 --- a/manifests/params.pp       2020-03-05 19:13:11.478497464 +0800
  24 +++ b/manifests/params.pp       2020-03-05 19:13:20.794497718 +0800
  25 @@ -47,6 +47,10 @@
  26            }
  27
  28          }
  29 +        'poky-stx': {
  30 +            $service_name = 'firewalld'
  31 +            $package_name = 'firewalld'
  32 +        }
  33          default: {
  34            $service_name = 'iptables-persistent'
  35            $package_name = 'iptables-persistent'
  36 diff --git a/manifests/linux.pp b/manifests/linux.pp
  37 index 0fd758a..d9280f5 100644
  38 --- a/manifests/linux.pp
  39 +++ b/manifests/linux.pp
  40 @@ -40,7 +40,7 @@ class firewall::linux (
  41          require         => Package['iptables'],
  42        }
  43      }
  44 -    'Debian', 'Ubuntu': {
  45 +    'Debian', 'Ubuntu', 'poky-stx': {
  46        class { "${title}::debian":
  47          ensure       => $ensure,
  48          enable       => $enable,