Merge "Fix multinode ovn/ovs with source deploy jobs"

playbooks/multinode-devstack-custom.yaml

@@ -0,0 +1,27 @@
+- hosts: all
+  vars:
+    install_ovs: false
+  roles:
+    - orchestrate-devstack
+    # For ovs from source jobs we need to reconfigure bridges after devstack setup
+    - multi-node-bridge
+    - multi-node-setup
+
+# We run tests only on one node, regardless how many nodes are in the system
+- hosts: tempest
+  tasks:
+    - name: Setup Tempest Run Directory
+      include_role:
+        name: setup-tempest-run-dir
+
+    - name: Setup Tempest Data Directory
+      include_role:
+        name: setup-tempest-data-dir
+
+    - name: ACL devstack files
+      include_role:
+        name: acl-devstack-files
+
+    - name: Run Tempest
+      include_role:
+        name: run-tempest

zuul.d/tempest-multinode.yaml

@@ -475,6 +475,7 @@
     # experimental queue
     name: neutron-ovn-tempest-full-multinode-ovs-master
     parent: neutron-ovn-multinode-base
+    run: playbooks/multinode-devstack-custom.yaml
     vars:
       tox_envlist: all
       tempest_test_regex: "^(?!.*\