X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-firewall%2Fpuppet-firewall-poky.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppetlabs-firewall%2Fpuppet-firewall-poky.patch;h=2c28ebd3b40378ed2109a855b8c28c29ce310bac;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch b/meta-stx/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch
new file mode 100644
index 0000000..2c28ebd
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch
@@ -0,0 +1,35 @@
+diff -ru a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
+--- a/lib/puppet/util/firewall.rb	2020-03-05 19:13:11.474497464 +0800
++++ b/lib/puppet/util/firewall.rb	2020-03-05 19:18:52.030506745 +0800
+@@ -154,6 +154,8 @@
+       'RedHat'
+     when 'Debian', 'Ubuntu'
+       'Debian'
++    when 'poky'
++      'Debian_poky'
+     else
+       Facter.value(:operatingsystem)
+     end
+@@ -208,7 +210,7 @@
+       when :IPv4
+         ["/bin/sh", "-c", "/sbin/iptables-save > /etc/iptables/rules"]
+       end
+-    when :Archlinux
++    when :Archlinux, :Debian_poky
+       case proto.to_sym
+       when :IPv4
+         ["/bin/sh", "-c", "/usr/sbin/iptables-save > /etc/iptables/iptables.rules"]
+diff -ru a/manifests/params.pp b/manifests/params.pp
+--- a/manifests/params.pp	2020-03-05 19:13:11.478497464 +0800
++++ b/manifests/params.pp	2020-03-05 19:13:20.794497718 +0800
+@@ -47,6 +47,10 @@
+           }
+ 
+         }
++        'poky': {
++            $service_name = 'firewalld'
++            $package_name = 'firewalld'
++        }
+         default: {
+           $service_name = 'iptables-persistent'
+           $package_name = 'iptables-persistent'