From 287f0cd3118e52f230ff15c91e0bc41120024d5e Mon Sep 17 00:00:00 2001
From: ybonatakis <ybonatakis@suse.com>
Date: Thu, 8 Aug 2024 18:00:54 +0200
Subject: [PATCH] Avoid using deprecated Autoyast config for firewall

* Avoid deprecation warning about using firewall property
  from SuSEfirewall2 times
* Use firewalld configuration instead

https://progress.opensuse.org/issues/156169
Signed-off-by: ybonatakis <ybonatakis@suse.com>
---
 contrib/ay-openqa-worker-leap-3-nvme.xml | 10 +++++++++-
 contrib/ay-openqa-worker.xml.erb         | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/contrib/ay-openqa-worker-leap-3-nvme.xml b/contrib/ay-openqa-worker-leap-3-nvme.xml
index f6b955c9cdc..f7320500b34 100644
--- a/contrib/ay-openqa-worker-leap-3-nvme.xml
+++ b/contrib/ay-openqa-worker-leap-3-nvme.xml
@@ -139,7 +139,15 @@
   <firewall>
     <enable_firewall t="boolean">true</enable_firewall>
     <start_firewall t="boolean">true</start_firewall>
-    <FW_CONFIGURATIONS_EXT>sshd</FW_CONFIGURATIONS_EXT>
+    <default_zone>public</default_zone>
+    <zones config:type="list">
+      <zone>
+	<name>public</name>
+	<services config:type="list">
+          <service>ssh</service>
+	</services>
+      </zone>
+    </zones>
   </firewall>
   <services-manager>
     <services>
diff --git a/contrib/ay-openqa-worker.xml.erb b/contrib/ay-openqa-worker.xml.erb
index 38207648a89..29bfe6434ca 100644
--- a/contrib/ay-openqa-worker.xml.erb
+++ b/contrib/ay-openqa-worker.xml.erb
@@ -98,7 +98,15 @@
   <firewall>
     <enable_firewall config:type="boolean">true</enable_firewall>
     <start_firewall config:type="boolean">true</start_firewall>
-    <FW_CONFIGURATIONS_EXT>sshd</FW_CONFIGURATIONS_EXT>
+    <default_zone>public</default_zone>
+    <zones config:type="list">
+      <zone>
+	<name>public</name>
+	<services config:type="list">
+          <service>ssh</service>
+	</services>
+      </zone>
+    </zones>
   </firewall>
   <services-manager t="map">
     <services>