From 03177e4336cfabfdb46d3f7ed8da883f6439091f Mon Sep 17 00:00:00 2001
From: Luis Tomas Bolivar <ltomasbo@redhat.com>
Date: Wed, 7 Oct 2020 11:09:03 +0200
Subject: [PATCH] Load qos to avoid missing qos-fip on OVN gates

Change-Id: If23b311ed07578b3fbe85f46aa4a314e6a05b7f3
---
 .zuul.d/sdn.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml
index 3ebe9f593..14fb7bcd7 100644
--- a/.zuul.d/sdn.yaml
+++ b/.zuul.d/sdn.yaml
@@ -26,7 +26,7 @@
     vars:
       devstack_localrc:
         Q_AGENT: ovn
-        ML2_L3_PLUGIN: ovn-router,trunk
+        ML2_L3_PLUGIN: ovn-router,trunk,qos
         OVN_DBS_LOG_LEVEL: dbg
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
         Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
@@ -49,6 +49,7 @@
         q-dhcp: false
         q-meta: false
         q-trunk: true
+        q-qos: true
         ovs-vswitchd: true
         ovsdb-server: true
       zuul_copy_output:
@@ -134,6 +135,7 @@
         OCTAVIA_AMP_IMAGE_SIZE: 3
         OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
         Q_AGENT: ovn
+        ML2_L3_PLUGIN: ovn-router,trunk,qos
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
         Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
         Q_ML2_TENANT_NETWORK_TYPE: geneve
@@ -142,7 +144,7 @@
         PHYSICAL_NETWORK: public
         OVN_L3_CREATE_PUBLIC_NETWORK: true
         ENABLE_CHASSIS_AS_GW: true
-        OVN_BRANCH: branch-20.06
+        OVN_BRANCH: v20.06.1
         KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
         KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
@@ -168,6 +170,7 @@
         q-dhcp: false
         q-meta: false
         q-trunk: true
+        q-qos: true
       devstack_local_conf:
         post-config:
           $OCTAVIA_CONF: