another change

Author: EmilienM

hack/ci/cloud-init/controller.yaml.tpl

@@ -14,11 +14,14 @@
 
     # Neutron
     enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
+    ENABLED_SERVICES+=,q-svc,neutron-trunk,ovn-controller,ovs-vswitchd,ovn-northd,ovsdb-server,q-ovn-metadata-agent
+    DISABLED_SERVICES+=,q-agt,q-dhcp,q-l3,q-meta,q-metering
     PUBLIC_BRIDGE_MTU=${MTU}
     ENABLE_CHASSIS_AS_GW="True"
     OVN_DBS_LOG_LEVEL="dbg"
     Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
     OVN_L3_CREATE_PUBLIC_NETWORK="True"
+    Q_AGENT="ovn"
 
     # Octavia
     enable_plugin octavia https://github.com/openstack/octavia stable/${OPENSTACK_RELEASE}
@@ -39,10 +42,6 @@
     # Glance
     ENABLED_SERVICES+=,g-api
 
-    # Neutron
-    ENABLED_SERVICES+=,q-svc,neutron-trunk,ovn-controller,ovs-vswitchd,ovn-northd,ovsdb-server,q-ovn-metadata-agent
-    DISABLED_SERVICES+=,q-agt,q-dhcp,q-l3,q-meta,q-metering
-
     # Octavia
     ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
 

hack/ci/cloud-init/worker.yaml.tpl

@@ -33,6 +33,7 @@
     ENABLE_CHASSIS_AS_GW="False"
     OVN_DBS_LOG_LEVEL="dbg"
     Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
+    Q_AGENT="ovn"
 
     # Nova
     ENABLED_SERVICES=n-cpu,placement-client,c-vol