Merge "Use ebtables-legacy also in ovn multinode jobs" into stable/victoria

2020-10-08 14:05:47 +00:00 · 2020-10-08 14:05:47 +00:00 · 69355990bc
parent f7282d909e 2458509c17
commit 69355990bc
2 changed files with 8 additions and 1 deletions
--- a/playbooks/prepare-ovn-multinode.yaml
+++ 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
--- 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: