From 8d64417174d6a46444363952cc3c5d956fac965d Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Thu, 4 Feb 2021 12:21:03 +0100
Subject: [PATCH] Make neutron-tempest-dvr-ha-multinode-full to be 2 nodes job

It was run on 3 nodes but I think there is no real need for that.
Running that on 2 nodes should be enough.

Conflicts:
    .zuul.yaml
    zuul.d/tempest-multinode.yaml

Change-Id: I12406c1f654ba9ad8eb60ffc965293ecbd5b7be5
(cherry picked from commit 1772e9543ef835eb24c3aacce5600593c6055d73)
---
 .zuul.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0d3cc72ba8f..287c3ea0efc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -325,7 +325,6 @@
 - job:
     name: neutron-tempest-dvr-ha-multinode-full
     parent: tempest-multinode-full-py3
-    nodeset: openstack-three-node-bionic
     timeout: 10800
     roles:
       - zuul: openstack/neutron-tempest-plugin
@@ -359,7 +358,7 @@
               bridge_mappings: public:br-ex
           $NEUTRON_L3_CONF:
             DEFAULT:
-              agent_mode: dvr
+              agent_mode: dvr_snat
             agent:
               availability_zone: nova
           $NEUTRON_DHCP_CONF: