fix comma and stuff

Author: EmilienM

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

@@ -34,7 +34,7 @@
     # 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
+    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"
@@ -54,6 +54,7 @@
 
     # Additional services
     ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
+    DISABLED_SERVICES+=${OPENSTACK_DISABLED_SERVICES}
 
     # Don't download default images, just our test images
     DOWNLOAD_DEFAULT_IMAGES=False

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

@@ -25,22 +25,23 @@
     DATABASE_TYPE=mysql
     DATABASE_HOST=$SERVICE_HOST
 
+    # Nova
+    ENABLED_SERVICES=n-cpu,placement-client,c-vol
+    VOLUME_BACKING_FILE_SIZE=100G
+
     # Neutron
     enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
     ENABLED_SERVICES+=,ovn-controller,ovs-vswitchd,ovsdb-server,q-fake,q-ovn-metadata-agent
-    DISABLED_SERVICES+=,q-svc,horizon,ovn-northd,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-vpn
+    DISABLED_SERVICES=q-svc,horizon,ovn-northd,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-vpn
     PUBLIC_BRIDGE_MTU=${MTU}
     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
-    VOLUME_BACKING_FILE_SIZE=100G
-
     # Additional services
     ENABLED_SERVICES+=${OPENSTACK_ADDITIONAL_SERVICES}
+    DISABLED_SERVICES+=${OPENSTACK_DISABLED_SERVICES}
 
     [[post-config|$NOVA_CONF]]
     [DEFAULT]