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

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch
deleted file mode 100644
index 2c28ebd..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppetlabs-firewall/puppet-firewall-poky.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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'