Revert Ceilometer install and use mariadb

Revert Ceiloemter install which was removed in the following
workaround.
https://review.opendev.org/#/c/751965/

Ceilometer use mariadb by the following fix, so we should also
change bindep.
https://review.opendev.org/#/c/752294/

Change-Id: If1860f7eb7b32975cbb5d1acc8bb5d595b514fb7
This commit is contained in:
Toshiaki Takahashi 2020-09-29 11:45:39 +09:00
parent b4fd1ab437
commit cf1f51fb7d
2 changed files with 9 additions and 12 deletions

View File

@ -50,17 +50,13 @@
# Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2007732
# - openstack/barbican
# Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2008121
# https://review.opendev.org/#/c/752294/
# - openstack/ceilometer
- openstack/ceilometer
- openstack/heat
- openstack/mistral
- openstack/mistral-dashboard
- openstack/networking-sfc
# Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2008121
# https://review.opendev.org/#/c/752294/
# https://storyboard.openstack.org/#!/story/2007732
# - openstack/python-barbicanclient
- openstack/python-blazarclient
- openstack/python-mistralclient
@ -89,10 +85,7 @@
heat: https://opendev.org/openstack/heat
networking-sfc: https://opendev.org/openstack/networking-sfc
aodh: https://opendev.org/openstack/aodh
# Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2008121
# https://review.opendev.org/#/c/752294/
# ceilometer: https://opendev.org/openstack/ceilometer
ceilometer: https://opendev.org/openstack/ceilometer
# Temporarily remove because of Ubuntu Focal Migration issue
# https://storyboard.openstack.org/#!/story/2007732
# barbican: https://opendev.org/openstack/barbican

View File

@ -3,8 +3,12 @@
gettext [test]
mysql-client [platform:dpkg]
mysql-server [platform:dpkg]
# Use mariadb instead of mysql
# related to https://review.opendev.org/#/c/752294/
#mysql-client [platform:dpkg]
#mysql-server [platform:dpkg]
postgresql
postgresql-client [platform:dpkg]
postgresql-server [platform:rpm]
mariadb [platform:rpm]
mariadb-server