From ad550eb8265178ea60d608fd00a0900f60398008 Mon Sep 17 00:00:00 2001
From: Eyal <eyal.bar-ilan@nokia.com>
Date: Wed, 21 Oct 2020 06:57:41 +0000
Subject: Revert "[goal] Migrate testing to ubuntu focal"

This reverts commit 3bb7b71e1afb378d47b449e9ba8ff8f633abe7d9.

https://github.com/gnocchixyz/gnocchi/issues/1069 was fixed

Change-Id: I3277ed13b4b343c553a3c21eab2187bb8abd4251
---
 devstack/settings | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'devstack')

diff --git a/devstack/settings b/devstack/settings
index 2ca3d7b7..142ecf7b 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,10 +16,6 @@ if [ "$CEILOMETER_BACKEND" = "gnocchi" ]; then
     enable_service gnocchi-api gnocchi-metricd
 fi
 
-# Use mariadb at least until below issue fix is released
-# https://github.com/gnocchixyz/gnocchi/issues/1069
-MYSQL_SERVICE_NAME=mariadb
-
 # Gnocchi default archive_policy for Ceilometer
 # TODO(sileht): when Gnocchi 4.0 is out use the tarball instead
 GNOCCHI_GIT_PATH=${GNOCCHI_GIT_PATH:-git+https://github.com/gnocchixyz/gnocchi#egg=gnocchi}
-- 
cgit v1.2.1