Merge "Fix trunk transition waiting message"
diff --git a/neutron_tempest_plugin/scenario/test_dns_integration.py b/neutron_tempest_plugin/scenario/test_dns_integration.py
index d520aa2..d6bafef 100644
--- a/neutron_tempest_plugin/scenario/test_dns_integration.py
+++ b/neutron_tempest_plugin/scenario/test_dns_integration.py
@@ -39,6 +39,8 @@
 # when designate_tempest_plugin is not available
 dns_base = testtools.try_import('designate_tempest_plugin.tests.base')
 dns_waiters = testtools.try_import('designate_tempest_plugin.common.waiters')
+dns_data_utils = testtools.try_import('designate_tempest_plugin.data_utils')
+
 if dns_base:
     DNSMixin = dns_base.BaseDnsV2Test
 else:
@@ -53,7 +55,7 @@
         super(BaseDNSIntegrationTests, cls).setup_clients()
         cls.zone_client = cls.os_tempest.dns_v2.ZonesClient()
         cls.recordset_client = cls.os_tempest.dns_v2.RecordsetClient()
-        cls.query_client.build_timeout = 30
+        cls.query_client.build_timeout = 60
 
     @classmethod
     def skip_checks(cls):
@@ -68,12 +70,13 @@
     @utils.requires_ext(extension="dns-integration", service="network")
     def resource_setup(cls):
         super(BaseDNSIntegrationTests, cls).resource_setup()
-        cls.zone = cls.zone_client.create_zone()[1]
-        cls.addClassResourceCleanup(cls.zone_client.delete_zone,
-            cls.zone['id'], ignore_errors=lib_exc.NotFound)
-        dns_waiters.wait_for_zone_status(
-            cls.zone_client, cls.zone['id'], 'ACTIVE')
-
+        cls.zone_name = dns_data_utils.rand_zone_name(
+            name="basednsintegrationtests")
+        cls.zone = cls.zone_client.create_zone(
+            name=cls.zone_name, wait_until='ACTIVE')[1]
+        cls.addClassResourceCleanup(
+            cls.zone_client.delete_zone, cls.zone['id'],
+            ignore_errors=lib_exc.NotFound)
         cls.network = cls.create_network(dns_domain=cls.zone['name'])
         cls.subnet = cls.create_subnet(cls.network)
         cls.subnet_v6 = cls.create_subnet(cls.network, ip_version=6)
@@ -250,8 +253,9 @@
     @classmethod
     def resource_setup(cls):
         super(DNSIntegrationExtraTests, cls).resource_setup()
-        cls.network2 = cls.create_network()
-        cls.subnet2 = cls.create_subnet(cls.network2)
+        cls.network2 = cls.create_network(
+            name=data_utils.rand_name('dns_integration_net'))
+        cls.subnet2 = cls.create_subnet(cls.network2, cidr='10.123.151.0/24')
         cls.subnet2_v6 = cls.create_subnet(cls.network2,
                                            ip_version=6,
                                            dns_publish_fixed_ip=True)
@@ -274,6 +278,16 @@
         self.client.delete_port(port['id'])
         self._verify_dns_records(addr_v6, name, record_type='AAAA',
                                  found=False)
+        self.client.update_subnet(
+            self.subnet2['id'], dns_publish_fixed_ip=True)
+        port = self.create_port(self.network2,
+                                dns_domain=self.zone['name'],
+                                dns_name=name)
+        addr_v4 = port['fixed_ips'][1 - v6_index]['ip_address']
+        self._verify_dns_records(addr_v4, name, record_type='A')
+        self.client.delete_port(port['id'])
+        self._verify_dns_records(addr_v4, name, record_type='A',
+                                 found=False)
 
 
 class DNSIntegrationDomainPerProjectTests(BaseDNSIntegrationTests):
@@ -286,19 +300,15 @@
     @classmethod
     def resource_setup(cls):
         super(BaseDNSIntegrationTests, cls).resource_setup()
-
-        name = data_utils.rand_name('test-domain')
-        zone_name = "%s.%s.%s.zone." % (cls.client.user_id,
+        cls.name = data_utils.rand_name('test-domain')
+        cls.zone_name = "%s.%s.%s.zone." % (cls.client.user_id,
                                         cls.client.project_id,
-                                        name)
-        dns_domain_template = "<user_id>.<project_id>.%s.zone." % name
-
-        cls.zone = cls.zone_client.create_zone(name=zone_name)[1]
+                                        cls.name)
+        dns_domain_template = "<user_id>.<project_id>.%s.zone." % cls.name
+        cls.zone = cls.zone_client.create_zone(
+            name=cls.zone_name, wait_until='ACTIVE')[1]
         cls.addClassResourceCleanup(cls.zone_client.delete_zone,
             cls.zone['id'], ignore_errors=lib_exc.NotFound)
-        dns_waiters.wait_for_zone_status(
-            cls.zone_client, cls.zone['id'], 'ACTIVE')
-
         cls.network = cls.create_network(dns_domain=dns_domain_template)
         cls.subnet = cls.create_subnet(cls.network,
                                        dns_publish_fixed_ip=True)
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index 32e2c4c..f038076 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -212,6 +212,7 @@
           (^tempest.api.compute.servers.test_multiple_create)"
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -244,6 +245,8 @@
     override-checkout: stable/2023.1
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-2023-1
diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml
index 7aa1642..63a63fa 100644
--- a/zuul.d/2023_2_jobs.yaml
+++ b/zuul.d/2023_2_jobs.yaml
@@ -207,6 +207,7 @@
           (^tempest.api.compute.servers.test_multiple_create)"
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -239,6 +240,8 @@
     override-checkout: stable/2023.2
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-2023-2
diff --git a/zuul.d/2024_1_jobs.yaml b/zuul.d/2024_1_jobs.yaml
index 86fbc52..c426be6 100644
--- a/zuul.d/2024_1_jobs.yaml
+++ b/zuul.d/2024_1_jobs.yaml
@@ -209,6 +209,7 @@
           (^tempest.api.compute.servers.test_multiple_create)"
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -238,6 +239,8 @@
     override-checkout: stable/2024.1
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-2024-1
diff --git a/zuul.d/2024_2_jobs.yaml b/zuul.d/2024_2_jobs.yaml
index 61d0351..bb77ca2 100644
--- a/zuul.d/2024_2_jobs.yaml
+++ b/zuul.d/2024_2_jobs.yaml
@@ -212,6 +212,7 @@
           (^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -240,6 +241,8 @@
     override-checkout: stable/2024.2
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-2024-2
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 5518798..01dada3 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -218,6 +218,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -326,6 +327,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -443,6 +445,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -457,6 +460,7 @@
     vars:
       devstack_localrc:
         NEUTRON_ENFORCE_SCOPE: false
+        NEUTRON_DEPLOY_MOD_WSGI: true
 
 - job:
     name: neutron-tempest-plugin-openvswitch-distributed-dhcp
@@ -610,6 +614,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -640,6 +645,7 @@
         OVN_DBS_LOG_LEVEL: dbg
         ENABLE_TLS: True
         OVN_IGMP_SNOOPING_ENABLE: True
+        NEUTRON_DEPLOY_MOD_WSGI: true
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
@@ -746,6 +752,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -761,7 +768,7 @@
     name: neutron-tempest-plugin-api
     parent: neutron-tempest-plugin-ovn
 
-- job:
+- job:  # Needed only in Neutron stable/2024.2
     name: neutron-tempest-plugin-api-ovs-wsgi
     parent: neutron-tempest-plugin-openvswitch
     voting: false
@@ -769,7 +776,7 @@
       devstack_localrc:
         NEUTRON_DEPLOY_MOD_WSGI: true
 
-- job:
+- job:  # Needed only in Neutron stable/2024.2
     name: neutron-tempest-plugin-api-ovn-wsgi
     parent: neutron-tempest-plugin-ovn
     voting: false
@@ -777,6 +784,22 @@
       devstack_localrc:
         NEUTRON_DEPLOY_MOD_WSGI: true
 
+- job:  # To be tested temporarily in the periodic queue
+    name: neutron-tempest-plugin-api-ovs-eventlet
+    parent: neutron-tempest-plugin-openvswitch
+    voting: false
+    vars:
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
+
+- job:  # To be tested temporarily in the periodic queue
+    name: neutron-tempest-plugin-api-ovn-eventlet
+    parent: neutron-tempest-plugin-ovn
+    voting: false
+    vars:
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
+
 - job:
     name: neutron-tempest-plugin-dvr-multinode-scenario
     parent: tempest-multinode-full
@@ -1004,6 +1027,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1029,6 +1053,7 @@
         # empty
         ADVANCED_IMAGE_NAME: ""
         NETWORK_API_EXTENSIONS: "{{ network_api_extensions_common | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: true
       devstack_plugins:
         designate: https://opendev.org/openstack/designate.git
       devstack_services:
@@ -1097,6 +1122,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1184,6 +1210,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1263,6 +1290,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1327,6 +1355,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1403,6 +1432,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1483,6 +1513,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1553,6 +1584,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
@@ -1673,6 +1705,7 @@
       - ^zuul.d/2023_1_jobs.yaml
       - ^zuul.d/2023_2_jobs.yaml
       - ^zuul.d/2024_1_jobs.yaml
+      - ^zuul.d/2024_2_jobs.yaml
       - ^zuul.d/base-nested-switch.yaml
       - ^zuul.d/master_jobs.yaml
       - ^zuul.d/victoria_jobs.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 595d478..5feac4e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -4,7 +4,6 @@
       jobs:
         - neutron-tempest-plugin-openvswitch
         - neutron-tempest-plugin-openvswitch-iptables_hybrid
-        - neutron-tempest-plugin-ovn-enforce-scope-old-defaults
         - neutron-tempest-plugin-ovn
         - neutron-tempest-plugin-designate-scenario:
             # TODO(slaweq) make job voting again once bug
@@ -15,7 +14,6 @@
         - neutron-tempest-plugin-openvswitch
         - neutron-tempest-plugin-ovn
         - neutron-tempest-plugin-openvswitch-iptables_hybrid
-        - neutron-tempest-plugin-ovn-enforce-scope-old-defaults
     #TODO(slaweq): Move neutron-tempest-plugin-dvr-multinode-scenario out of
     #              the experimental queue when it will be more stable
     experimental:
@@ -24,8 +22,12 @@
         - neutron-tempest-plugin-dvr-multinode-scenario
         - neutron-tempest-plugin-openvswitch-distributed-dhcp
         - neutron-tempest-plugin-openvswitch-iptables_hybrid-distributed-dhcp
-        - neutron-tempest-plugin-api-ovs-wsgi
-        - neutron-tempest-plugin-api-ovn-wsgi
+        - neutron-tempest-plugin-api-ovs-eventlet
+        - neutron-tempest-plugin-api-ovn-eventlet
+        - neutron-tempest-plugin-ovn-enforce-scope-old-defaults
+    periodic:
+      jobs:
+        - neutron-tempest-plugin-ovn-enforce-scope-old-defaults
 
 
 - project-template:
@@ -200,7 +202,6 @@
     templates:
       - build-openstack-docs-pti
       - neutron-tempest-plugin-jobs
-      - neutron-tempest-plugin-jobs-2023-1
       - neutron-tempest-plugin-jobs-2023-2
       - neutron-tempest-plugin-jobs-2024-1
       - neutron-tempest-plugin-jobs-2024-2
@@ -210,33 +211,27 @@
     check:
       jobs:
         - neutron-tempest-plugin-sfc
-        - neutron-tempest-plugin-sfc-2023-1
         - neutron-tempest-plugin-sfc-2023-2
         - neutron-tempest-plugin-sfc-2024-1
         - neutron-tempest-plugin-sfc-2024-2
         - neutron-tempest-plugin-bgpvpn-bagpipe
-        - neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
         - neutron-tempest-plugin-bgpvpn-bagpipe-2023-2
         - neutron-tempest-plugin-bgpvpn-bagpipe-2024-1
         - neutron-tempest-plugin-bgpvpn-bagpipe-2024-2
         - neutron-tempest-plugin-dynamic-routing
-        - neutron-tempest-plugin-dynamic-routing-2023-1
         - neutron-tempest-plugin-dynamic-routing-2023-2
         - neutron-tempest-plugin-dynamic-routing-2024-1
         - neutron-tempest-plugin-dynamic-routing-2024-2
         - neutron-tempest-plugin-fwaas
-        - neutron-tempest-plugin-fwaas-2023-1
         - neutron-tempest-plugin-fwaas-2023-2
         - neutron-tempest-plugin-fwaas-2024-1
         - neutron-tempest-plugin-fwaas-2024-2
         - neutron-tempest-plugin-vpnaas
         - neutron-tempest-plugin-vpnaas-ovn
-        - neutron-tempest-plugin-vpnaas-2023-1
         - neutron-tempest-plugin-vpnaas-2023-2
         - neutron-tempest-plugin-vpnaas-2024-1
         - neutron-tempest-plugin-vpnaas-2024-2
         - neutron-tempest-plugin-tap-as-a-service
-        - neutron-tempest-plugin-tap-as-a-service-2023-1
         - neutron-tempest-plugin-tap-as-a-service-2023-2
         - neutron-tempest-plugin-tap-as-a-service-2024-1
         - neutron-tempest-plugin-tap-as-a-service-2024-2
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index b208ab5..817e759 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -244,6 +244,7 @@
         CUSTOMIZE_IMAGE: false
         OVN_BRANCH: "v21.06.0"
         OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index ea64224..56ed2cf 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -181,6 +181,7 @@
         NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
         OVN_BRANCH: "v21.06.0"
         OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -214,6 +215,8 @@
         override-checkout: 0.16.0
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-wallaby
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 4d35497..c39db75 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -175,6 +175,7 @@
       network_api_extensions: *api_extensions
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -202,6 +203,8 @@
     required-projects: *required-projects-xena
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-xena
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 04bbc31..387e397 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -189,6 +189,7 @@
         - vlan-transparent
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -217,6 +218,8 @@
     nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-yoga
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index e2bdb50..70ab40a 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -199,6 +199,7 @@
         - vlan-transparent
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+        NEUTRON_DEPLOY_MOD_WSGI: false
       devstack_services:
         q-ovn-metadata-agent: true
         q-ovn-agent: false
@@ -227,6 +228,8 @@
     nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       network_api_extensions_common: *api_extensions
+      devstack_localrc:
+        NEUTRON_DEPLOY_MOD_WSGI: false
 
 - job:
     name: neutron-tempest-plugin-sfc-zed