Fix multinode gate, separate variations for OVN and OVS.

Change-Id: I425e7fe1d220b5f760bd5514c853d3e377190d82

.zuul.d/base.yaml

@@ -65,6 +65,11 @@
         c-vol: false
         cinder: false
         tempest: true
+        ovn-controller: false
+        ovn-northd: false
+        q-ovn-metadata-agent: false
+        ovs-vswitchd: false
+        ovsdb-server: false
         neutron: true
         q-agt: true
         q-dhcp: true

.zuul.d/multinode.yaml

@@ -39,9 +39,110 @@
           tls-proxy: false
           c-vol: false
           c-bak: false
+          neutron: true
+          q-agt: true
+          q-dhcp: true
+          q-l3: true
+          q-meta: true
         devstack_localrc:
           KURYR_FORCE_IMAGE_BUILD: true
           USE_PYTHON3: true
+          Q_AGENT: openvswitch
+          Q_ML2_TENANT_NETWORK_TYPE: vxlan
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+          ML2_L3_PLUGIN: router
+    vars:
+      devstack_localrc:
+          KURYR_K8S_API_URL: "https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"
+          KURYR_K8S_MULTI_WORKER_TESTS: True
+      devstack_services:
+        tls-proxy: false
+        kubernetes-worker: false
+        kubernetes-master: true
+        kuryr-daemon: true
+        kuryr-kubernetes: true
+    voting: false
+
+- job:
+    name: kuryr-kubernetes-tempest-multinode-ovn
+    parent: kuryr-kubernetes-tempest-multinode
+    description: |
+        Kuryr-Kubernetes tempest multinode job using OVN
+    nodeset: openstack-two-node-focal
+    host-vars:
+      controller:
+        devstack_services:
+          ovn-northd: true
+          ovn-controller: true
+          q-ovn-metadata-agent: true
+          q-svc: true
+          q-agt: false
+          q-l3: false
+          q-dhcp: false
+          q-meta: false
+          q-trunk: true
+          q-qos: true
+          ovs-vswitchd: true
+          ovsdb-server: true
+        devstack_localrc:
+          Q_AGENT: ovn
+          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
+          Q_ML2_TENANT_NETWORK_TYPE: geneve
+          Q_USE_PROVIDERNET_FOR_PUBLIC: true
+          VAR_RUN_PATH: /usr/local/var/run
+          PHYSICAL_NETWORK: public
+          OVN_L3_CREATE_PUBLIC_NETWORK: true
+          OVN_BUILD_FROM_SOURCE: true
+          ENABLE_CHASSIS_AS_GW: true
+          OVN_BRANCH: v20.06.1
+          KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
+          ENABLE_TLS: True
+          KURYR_FORCE_IMAGE_BUILD: true
+          USE_PYTHON3: true
+        zuul_copy_output:
+          '{{ devstack_base_dir }}/data/ovn': 'logs'
+          '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+          '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
+    group-vars:
+      subnode:
+        devstack_services:
+          ovn-northd: true
+          ovn-controller: true
+          q-ovn-metadata-agent: true
+          q-svc: true
+          q-agt: false
+          q-l3: false
+          q-dhcp: false
+          q-meta: false
+          q-trunk: true
+          q-qos: true
+          ovs-vswitchd: true
+          ovsdb-server: true
+        devstack_localrc:
+          Q_AGENT: ovn
+          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
+          Q_ML2_TENANT_NETWORK_TYPE: geneve
+          Q_USE_PROVIDERNET_FOR_PUBLIC: true
+          VAR_RUN_PATH: /usr/local/var/run
+          PHYSICAL_NETWORK: public
+          OVN_L3_CREATE_PUBLIC_NETWORK: true
+          OVN_BUILD_FROM_SOURCE: true
+          ENABLE_CHASSIS_AS_GW: true
+          OVN_BRANCH: v20.06.1
+          KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
+          ENABLE_TLS: True
+          KURYR_FORCE_IMAGE_BUILD: true
+          USE_PYTHON3: true
+        zuul_copy_output:
+          '{{ devstack_base_dir }}/data/ovn': 'logs'
+          '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
+          '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
     vars:
       devstack_localrc:
           KURYR_K8S_API_URL: "https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"

.zuul.d/project.yaml

@@ -22,6 +22,7 @@
         - kuryr-kubernetes-tempest-ovn
         - kuryr-kubernetes-tempest-network-policy
         - kuryr-kubernetes-tempest-multinode
+        - kuryr-kubernetes-tempest-multinode-ovn
         - kuryr-kubernetes-tempest-ipv6
         - kuryr-kubernetes-tempest-ovn-ipv6
         - kuryr-kubernetes-tempest-ovn-provider-ovn