From 093a3d4642ea65a120ec2d887a8fac67d6b0485a Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Wed, 15 Jan 2025 12:28:34 +0100
Subject: [PATCH] Multinode jobs use nested-virt nodes

The nodes acting as computes should be nested-virt nodes.
The devstack-tobiko-multinode job is modified to use ML2/OVN instead of
ML2/OVS.

Change-Id: If03d768503c14ee87a091d4c8d86b50519d8b9af
---
 zuul.d/devstack-tobiko.yaml | 82 +++++++++----------------------------
 zuul.d/nodesets.yaml        |  7 ++--
 2 files changed, 24 insertions(+), 65 deletions(-)

diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml
index d902f35..d934419 100644
--- a/zuul.d/devstack-tobiko.yaml
+++ b/zuul.d/devstack-tobiko.yaml
@@ -114,72 +114,30 @@
       devstack_localrc:
         ENABLE_FILE_INJECTION: true
         MULTI_HOST: 1
-        # NOTE(slaweq): remove those lines when switching to the default
-        # (ML2/OVN) backend in Neutron
-        Q_AGENT: openvswitch
-        Q_ML2_TENANT_NETWORK_TYPE: vxlan
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
-        # https://bugs.launchpad.net/neutron/+bug/2031415
-        GLOBAL_VENV: false
+        LIBVIRT_TYPE: kvm
+        LIBVIRT_CPU_MODE: host-passthrough
+        NOVA_ALLOW_MOVE_TO_SAME_HOST: false
+        LIVE_MIGRATION_AVAILABLE: true
+        USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION: true
       devstack_local_conf:
         post-config:
-          /$NEUTRON_CORE_PLUGIN_CONF:
-            AGENT:
-              tunnel_types: gre,vxlan
-      devstack_services:
-        n-cpu: false
-        neutron-qos: true
-        neutron-trunk: false
-        # Disable OVN services
-        # It's temporary workaround until test
-        # OvnControllerTest::test_restart_ovn_controller test
-        # will be fixed in multinode job running on the OVN backend
-        ovn-controller: false
-        ovn-northd: false
-        ovs-vswitchd: false
-        ovsdb-server: false
-        q-ovn-metadata-agent: false
-        # Neutron services
-        q-agt: true
-        q-dhcp: true
-        q-l3: true
-        q-meta: true
+          $NOVA_CONF:
+            workarounds:
+              skip_cpu_compare_at_startup: true
+              skip_cpu_compare_on_dest: true
     group-vars:
       subnode:
+        devstack_services:
+          tls-proxy: false
         devstack_localrc:
-          # NOTE(slaweq): remove those lines when switching to the default
-          # (ML2/OVN) backend in Neutron
-          Q_AGENT: openvswitch
+          LIBVIRT_TYPE: kvm
+          LIBVIRT_CPU_MODE: host-passthrough
+          NOVA_ALLOW_MOVE_TO_SAME_HOST: false
+          LIVE_MIGRATION_AVAILABLE: true
+          USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION: true
         devstack_local_conf:
           post-config:
-            /$NEUTRON_CORE_PLUGIN_CONF:
-              AGENT:
-                tunnel_types: gre,vxlan
-        devstack_services:
-          c-vol: true
-          dstat: true
-          heat: false
-          h-api: false
-          h-api-cfn: false
-          h-eng: false
-          n-api-meta: true
-          placement-client: true
-          n-cpu: true
-          # Disable OVN services
-          # It's temporary workaround until test
-          # OvnControllerTest::test_restart_ovn_controller test
-          # will be fixed in multinode job running on the OVN backend
-          ovn-controller: false
-          ovn-northd: false
-          ovs-vswitchd: false
-          ovsdb-server: false
-          q-ovn-metadata-agent: false
-          # Neutron services
-          q-agt: true
-          q-l3: true
-          q-meta: true
-          neutron-qos: true
-          neutron-trunk: false
-          # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
-          memory_tracker: false
-          tls-proxy: false
+            $NOVA_CONF:
+              workarounds:
+                skip_cpu_compare_at_startup: true
+                skip_cpu_compare_on_dest: true
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index c6e6713..2348544 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -26,11 +26,11 @@
     name: devstack-tobiko-multinode
     nodes:
       - name: controller
-        label: ubuntu-jammy
+        label: nested-virt-ubuntu-jammy
       - name: compute1
-        label: ubuntu-jammy
+        label: nested-virt-ubuntu-jammy
       - name: compute2
-        label: ubuntu-jammy
+        label: nested-virt-ubuntu-jammy
     groups: &MULTINODE_GROUPS
       # Node where tests are executed and test results collected
       - name: tempest
@@ -39,6 +39,7 @@
       # Nodes running the compute service
       - name: compute
         nodes:
+          - controller
           - compute1
           - compute2
       # Nodes that are not the controller