From b23928b68e1f6e478851fb61f97596e572825337 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Tue, 16 Jun 2020 12:31:51 +0200
Subject: [PATCH] Remove neutron-fwaas from the jobs' required project

Neutron-fwaas is going to be deprecated in master branch with [1].

[1] https://review.opendev.org/#/c/735828/

Depends-On: https://review.opendev.org/737731
Change-Id: Ifca2676ef89a81d373e3bebf58c3c25880ed1905
---
 .zuul.yaml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 2777e2eeb..b166a7510 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -125,7 +125,6 @@
       networking services enabled.
     required-projects:
       - openstack/designate
-      - openstack/neutron-fwaas
       - openstack/octavia
     vars:
       devstack_local_conf:
@@ -139,18 +138,11 @@
               network_driver: network_noop_driver
             certificates:
               cert_manager: local_cert_manager
-          $NEUTRON_CONF:
-            fwaas:
-              agent_version: v2
-              driver: iptables_v2
-              enabled: true
-              firewall_l2_driver: ovs
       devstack_localrc:
-        Q_SERVICE_PLUGIN_CLASSES: qos,trunk,firewall_v2
+        Q_SERVICE_PLUGIN_CLASSES: qos,trunk
       devstack_plugins:
         designate: https://opendev.org/openstack/designate
         octavia: https://opendev.org/openstack/octavia
-        neutron-fwaas: https://opendev.org/openstack/neutron-fwaas
       devstack_services:
         designate: true
         octavia: true
@@ -159,7 +151,6 @@
         o-hm: true
         o-hk: true
         neutron-dns: true
-        neutron-fwaas-v2: true
         s-account: false
         s-container: false
         s-object: false