From a8ceb09f98e3386d9c84ce8fcb862042aea190bb Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Fri, 2 Oct 2020 16:35:04 +0200
Subject: [PATCH] Use ebtables-legacy also in ovn multinode jobs

For other jobs which inherits from neutron-tempest-base it
was changed some time ago.
But ovn multinode jobs don't inherits from that base job
so this patch fixes it for those jobs as well by adding same
configure_ebtables.yaml playbook to pre-run in the
neutron-ovn-multinode-base job.

Change-Id: Icb4fd80133ee10ad6c40e160013b4ab91d2c5a6b
Closes-Bug: #1898211
---
 playbooks/prepare-ovn-multinode.yaml | 7 +++++++
 zuul.d/tempest-multinode.yaml        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/prepare-ovn-multinode.yaml

diff --git a/playbooks/prepare-ovn-multinode.yaml b/playbooks/prepare-ovn-multinode.yaml
new file mode 100644
index 00000000000..d056f9f289c
--- /dev/null
+++ b/playbooks/prepare-ovn-multinode.yaml
@@ -0,0 +1,7 @@
+- hosts: all
+  roles:
+    # TODO(slaweq): remove it when nftables will support syntax for src and
+    # destination IP addresses in arp tables:
+    - legacy_ebtables
+    - multi-node-bridge
+    - multi-node-setup
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index cd1d037643e..f6959d6b0d0 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -116,7 +116,7 @@
     roles:
       - zuul: zuul/zuul-jobs
       - zuul: openstack/neutron-tempest-plugin
-    pre-run: playbooks/multinode-setup.yaml
+    pre-run: playbooks/prepare-ovn-multinode.yaml
     vars:
       devstack_local_conf:
         test-config: