commit cf1f51fb7d8962ca63dc4d9e11038e1626960149
Author: Toshiaki Takahashi <ts-takahashi@nec.com>
Date:   Tue Sep 29 11:45:39 2020 +0900

    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

diff --git a/.zuul.yaml b/.zuul.yaml
index fc64723..5511ae7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -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
diff --git a/bindep.txt b/bindep.txt
index b432b37..6c642ec 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -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