From c3bbbf575f891a00dd41db2e329540c02784234a Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Mon, 6 Jan 2020 07:24:19 +0100
Subject: [PATCH] [OVN] Update zuul jobs to use local OVN driver

Some jobs are still using the networking-ovn driver.

Change-Id: I76d98595b7e9b7de152f7bc7c4ca65ee4c79ab4b
---
 zuul.d/rally.yaml             |  9 ++++++---
 zuul.d/tempest-multinode.yaml | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index 5fa0e642aaa..67d1c842eba 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -44,12 +44,11 @@
       - name: openstack/devstack-gate
       - name: openstack/rally
       - name: openstack/rally-openstack
-      - name: openstack/networking-ovn
     irrelevant-files: *irrelevant-files
     vars:
       devstack_plugins:
+        neutron: https://opendev.org/openstack/neutron
         rally-openstack: https://opendev.org/openstack/rally-openstack
-        networking-ovn: https://opendev.org/openstack/networking-ovn
       zuul_copy_output:
         '{{ devstack_base_dir }}/data/ovs': 'logs'
       extensions_to_txt:
@@ -59,7 +58,7 @@
         ovn-controller: true
         ovs-vswitchd: true
         ovsdb-server: true
-        networking-ovn-metadata-agent: true
+        neutron-ovn-metadata-agent: true
         br-ex-tcpdump: true
         br-int-flows: true
         q-dhcp: false
@@ -67,7 +66,11 @@
         q-agt: false
         q-meta: false
         q-metering: false
+        q-dns: true
       devstack_localrc:
+        Q_AGENT: ovn
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+        Q_ML2_TENANT_NETWORK_TYPE: geneve
         USE_PYTHON3: true
         PHYSICAL_NETWORK: public
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index 3c0f359cba9..dbe612c0759 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -89,7 +89,6 @@
     timeout: 10800
     required-projects:
       - openstack/devstack-gate
-      - openstack/networking-ovn
       - openstack/neutron
       - openstack/neutron-tempest-plugin
       - openstack/octavia
@@ -101,6 +100,9 @@
     pre-run: playbooks/multinode-setup.yaml
     vars:
       devstack_localrc:
+        Q_AGENT: ovn
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+        Q_ML2_TENANT_NETWORK_TYPE: geneve
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
         PHYSICAL_NETWORK: public
         ENABLE_CHASSIS_AS_GW: true
@@ -115,7 +117,7 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
       devstack_plugins:
-        networking-ovn: https://opendev.org/openstack/networking-ovn
+        neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
         octavia: https://opendev.org/openstack/octavia
       zuul_copy_output:
@@ -127,7 +129,7 @@
         etcd: false
         br-ex-tcpdump: true
         br-int-flows: true
-        networking-ovn-metadata-agent: true
+        neutron-ovn-metadata-agent: true
         o-api: true
         o-hk: true
         ovn-controller: true
@@ -143,6 +145,7 @@
         q-l3: false
         q-meta: false
         q-metering: false
+        q-dns: true
         # When running python3 Swift should be disabled for now
         s-account: false
         s-container: false
@@ -165,8 +168,11 @@
           q-l3: false
           q-meta: false
           q-metering: false
-          networking-ovn-metadata-agent: true
+          neutron-ovn-metadata-agent: true
         devstack_localrc:
+          Q_AGENT: ovn
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+          Q_ML2_TENANT_NETWORK_TYPE: geneve
           Q_USE_PROVIDERNET_FOR_PUBLIC: true
           PHYSICAL_NETWORK: public
           ENABLE_CHASSIS_AS_GW: false