From 3b1bd13e0b61c96f53acc8a9d78baaf91acffd7f Mon Sep 17 00:00:00 2001
From: Ayumu Ueha <ueha.ayumu@fujitsu.com>
Date: Thu, 13 May 2021 14:18:20 +0000
Subject: [PATCH] Avoid FT errors caused by other projects change

Zuul FT has failed by multiple reasons,
  A: devstack changes default ML2 Driver to OVN.
  B: kuryr-kubernetes changes to use kubeadm.

This patch is just workaround for FT errors caused by above changes.
The formal fixes will be done separately.

[About A: devstack change]
Zuul FT has failed to build the environment with the following error:
'The q-agt/neutron-agt service must be disabled with OVN.'

The FT error is caused by a merged devstack patch [1],
[1] https://review.opendev.org/c/openstack/devstack/+/791436

This patch temporarily set ML2 driver to `openvswitch` that was used as
default value before merging [1] patch.

[About B: kuryr-kubernetes change]
Some nodes using the kuryr-kubernetes service will fail to build with
the error shown in the bug report [2].
[2] https://bugs.launchpad.net/bugs/1930368

Above error seems to be occured by kuryr-kubernetes patch [3] that
changes to use kubeadm for installing Kubernetes on devstack.
[3] https://review.opendev.org/c/openstack/kuryr-kubernetes/+/779250

This patch temporarily use kuryr-kubernetes stable/wallaby branch
for resolving FT error.

Change-Id: I7742c30ed6cb910d58183c18e859acac244ff3ae
---
 .zuul.yaml | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 420483831..516a57442 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -112,6 +112,11 @@
         Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
         L2_AGENT_EXTENSIONS: qos
         DEVSTACK_PARALLEL: True
+        # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+        # devstack has changed default to OVN and needs to be followed.
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
       test_matrix_configs: [neutron]
       zuul_work_dir: src/opendev.org/openstack/tacker
     host-vars:
@@ -232,12 +237,24 @@
             router"
           Q_ML2_PLUGIN_EXT_DRIVERS: port_security,qos
           L2_AGENT_EXTENSIONS: qos
+          # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+          # devstack has changed default to OVN and needs to be followed.
+          Q_AGENT: openvswitch
+          Q_ML2_TENANT_NETWORK_TYPE: vxlan
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
         devstack_plugins:
           ceilometer: https://opendev.org/openstack/ceilometer
         devstack_services:
           ceilometer-acompute: true
           # To override the parent job's definitions.
           tls-proxy: false
+          # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+          # devstack has changed default to OVN and needs to be followed.
+          q-agt: true
+          ovn-controller: false
+          ovs-vswitchd: false
+          ovsdb-server: false
+          q-ovn-metadata-agent: false
 
 - job:
     name: tacker-functional-devstack-multinode-sol
@@ -289,7 +306,10 @@
       - openstack/heat
       - openstack/horizon
       - openstack/keystone
-      - openstack/kuryr-kubernetes
+      # TODO(ueha): temporarily use stable/wallaby branch for solve FT error.
+      # After confirming that it works in the master branch, modify it.
+      - name: openstack/kuryr-kubernetes
+        override-branch: stable/wallaby
       - openstack/mistral
       - openstack/neutron
       - openstack/nova
@@ -403,6 +423,11 @@
           TACKER_HOST: "{{ hostvars['controller-tacker']['nodepool']['private_ipv4'] }}"
           TACKER_MODE: standalone
           USE_PYTHON3: true
+          # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+          # devstack has changed default to OVN and needs to be followed.
+          Q_AGENT: openvswitch
+          Q_ML2_TENANT_NETWORK_TYPE: vxlan
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
         devstack_services:
           dstat: false
           horizon: false
@@ -416,6 +441,12 @@
           n-sch: false
           q-agt: true
           tls-proxy: false
+          # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+          # devstack has changed default to OVN and needs to be followed.
+          ovn-controller: false
+          ovs-vswitchd: false
+          ovsdb-server: false
+          q-ovn-metadata-agent: false
     vars:
       devstack_localrc:
         CELLSV2_SETUP: singleconductor
@@ -437,6 +468,11 @@
         TACKER_MODE: standalone
         USE_PYTHON3: true
         DEVSTACK_PARALLEL: True
+        # TODO(ueha): The network ML2 driver is changed to OVS to pass the FT.
+        # devstack has changed default to OVN and needs to be followed.
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
       devstack_local_conf:
         post-config:
           $NEUTRON_DHCP_CONF: