Merge "Explicitly set jobs to ML2/OVS"

zuul.d/ironic-jobs.yaml

@@ -56,6 +56,7 @@
 
         Q_AGENT: openvswitch
         Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
         SERVICE_TIMEOUT: 90
 
       devstack_plugins:
@@ -72,6 +73,9 @@
         q-meta: true
         q-metering: true
         q-svc: true
+        ovn-controller: false
+        ovn-northd: false
+        q-ovn-metadata-agent: false
 
         c-api: False
         c-bak: False
@@ -510,6 +514,7 @@
         Q_AGENT: openvswitch
         Q_ML2_TENANT_NETWORK_TYPE: vlan
         Q_PLUGIN: ml2
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
         TENANT_VLAN_RANGE: 100:150
@@ -559,6 +564,9 @@
         q-meta: True
         q-metering: True
         q-svc: True
+        ovn-controller: False
+        ovn-northd: False
+        q-ovn-metadata-agent: False
         rabbit: True
     group-vars:
       subnode:
@@ -585,6 +593,7 @@
           OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br-infra'
           OVS_PHYSICAL_BRIDGE: sub1brbm
           PHYSICAL_NETWORK: mynetwork
+          Q_AGENT: openvswitch
           Q_ML2_TENANT_NETWORK_TYPE: vlan
           VIRT_DRIVER: ironic
           PUBLIC_BRIDGE: br-infra
@@ -597,6 +606,9 @@
           cinder: False
 
           q-agt: True
+          ovn-controller: False
+          ovn-northd: False
+          q-ovn-metadata-agent: False
           n-cpu: True
 
 - job: