Merge "Replace the OVN Metadata agent with the OVN agent"

zuul.d/master_jobs.yaml

@@ -271,6 +271,7 @@
         - vlan-transparent
       devstack_localrc:
         Q_AGENT: ovn
+        OVN_AGENT_EXTENSIONS: 'metadata'
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
         # NOTE(ralonsoh): during the eventlet removal, the "logger" mech
         # driver has been removed from this list. Re-add it once the removal
@@ -287,7 +288,8 @@
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
-        q-ovn-metadata-agent: true
+        q-ovn-metadata-agent: false
+        q-ovn-agent: true
         ovn-controller: true
         ovn-northd: true
         ovs-vswitchd: true
@@ -352,7 +354,8 @@
           q-l3: false
           q-meta: false
           q-metering: false
-          q-ovn-metadata-agent: true
+          q-ovn-metadata-agent: false
+          q-ovn-agent: true
           tls-proxy: true
           dstat: true
         devstack_localrc: