From 7084889b17b724cc87264929fe8cf4ba9ebf7229 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Fri, 17 Jun 2022 15:06:42 +0200
Subject: [PATCH] Fix DVR jobs:

  - remove dvr-no-external job

Change-Id: I7f20d0e79e6e2af380c8ca2fe8ec3edb7d0af294
---
 zuul.d/devstack-tobiko-ovs.yaml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/zuul.d/devstack-tobiko-ovs.yaml b/zuul.d/devstack-tobiko-ovs.yaml
index aca01c4..44d1828 100644
--- a/zuul.d/devstack-tobiko-ovs.yaml
+++ b/zuul.d/devstack-tobiko-ovs.yaml
@@ -9,7 +9,6 @@
         - devstack-tobiko-ovs
         - devstack-tobiko-ovs-dvr
         - devstack-tobiko-ovs-dvr-snat
-        - devstack-tobiko-ovs-dvr-no-external
     gate:
       jobs:
         - devstack-tobiko-ovs
@@ -96,25 +95,25 @@
             DEFAULT:
               router_distributed: true
           $NEUTRON_DHCP_CONF:
-            agent:
-              availability_zone: nova
+            DEFAULT:
+              dhcp_delete_namespaces: true
           $NEUTRON_L3_CONF:
             DEFAULT:
               agent_mode: '{{ l3_agent_mode }}'
-            agent:
-              availability_zone: nova
-              debug_iptables_rules: true
+              router_delete_namespaces: true
           $NEUTRON_CORE_PLUGIN_CONF:
             agent:
-              arp_responder: true
               enable_distributed_routing: true
               l2_population: true
               tunnel_types: vxlan
             ml2:
               mechanism_drivers: openvswitch,l2population
+              type_drivers: flat,vlan,vxlan
+              tenant_network_types: vxlan
+            ml2_type_vxlan:
+              vni_ranges: '1000:1999'
             ovs:
-              bridge_mappings: public:br-ex
-              tunnel_bridge: br-tun
+              local_ip: '$HOST_IP'
 
 
 - job:
@@ -128,17 +127,6 @@
       l3_agent_mode: dvr_snat
 
 
-- job:
-    name: devstack-tobiko-ovs-dvr-no-external
-    parent: devstack-tobiko-ovs-dvr
-    description: |
-      Base Tobiko devstack job to be used with ML2/OVS and dvr_no_external L3
-      agent mode
-    voting: true
-    vars:
-      l3_agent_mode: dvr_no_external
-
-
 # --- MULTINODE --------------------------------------------------------------
 
 - job: