CI: Revert temporary fixes for aodh and ceilometer
This patch reverts the temporary CI fixes for issues of
python-aodhclient and ceilometer in the patch [1] and [2].
[1]
[2]
- openstack/blazar-nova
- openstack/horizon
- openstack/barbican
- #- openstack/ceilometer
+ - openstack/ceilometer
- openstack/heat
- openstack/mistral
- openstack/mistral-dashboard
- openstack/networking-sfc
- # TODO(ueha): Remove after the following hotfix is applied to
- # python-aodhclient installed by pip.
- # https://review.opendev.org/c/openstack/python-aodhclient/+/819393
- - openstack/python-aodhclient
- openstack/python-barbicanclient
- openstack/python-blazarclient
- openstack/python-mistralclient
heat: https://opendev.org/openstack/heat
networking-sfc: https://opendev.org/openstack/networking-sfc
aodh: https://opendev.org/openstack/aodh
- # TODO(ueha): Remove after the following hotfix is applied to
- # python-aodhclient installed by pip.
- # https://review.opendev.org/c/openstack/python-aodhclient/+/819393
- python-aodhclient: https://opendev.org/openstack/python-aodhclient
barbican: https://opendev.org/openstack/barbican
mistral: https://opendev.org/openstack/mistral
blazar: https://opendev.org/openstack/blazar
tox_install_siblings: false
controller-tacker:
devstack_plugins:
- #ceilometer: https://opendev.org/openstack/ceilometer
+ ceilometer: https://opendev.org/openstack/ceilometer
tacker: https://opendev.org/openstack/tacker
devstack_services:
# OVN services
# Neutron services
q-ovn-metadata-agent: true
# Ceilometer services
- #ceilometer-acompute: false
- #ceilometer-acentral: true
- #ceilometer-aipmi: false
- #ceilometer-anotification: true
+ ceilometer-acompute: false
+ ceilometer-acentral: true
+ ceilometer-aipmi: false
+ ceilometer-anotification: true
# Tacker services
tacker: true
tacker-conductor: true
# gnocchi setup would run on every compute nodes (esp. multiple asynchronous calls
# of recreate_database() would be disastrous). Unused api servers would also be
# deployed on each compute node.
- #CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
+ CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
Q_SERVICE_PLUGIN_CLASSES: "qos,\
networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,\
neutron.services.qos.qos_plugin.QoSPlugin,\
L2_AGENT_EXTENSIONS: qos
ENABLE_CHASSIS_AS_GW: false
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
- #devstack_plugins:
- #ceilometer: https://opendev.org/openstack/ceilometer
+ devstack_plugins:
+ ceilometer: https://opendev.org/openstack/ceilometer
devstack_services:
- #ceilometer-acompute: true
+ ceilometer-acompute: true
# To override the parent job's definitions.
tls-proxy: false
# OVN services
