From 4fed4a028aa7c897972bcf44a0f447b7a7e450b8 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Sat, 8 Jun 2013 22:38:04 +0200 Subject: [PATCH] Initial mariadb support mariadb only differs in the package name from the mysql, an already installed mariadb should not cause hangup in a devstack installation. Fixing Bug 1184722 Change-Id: I3b9d02b703e49044999ff1b9f1195ffcaf1d0cec --- bin/heat-db-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/heat-db-setup b/bin/heat-db-setup index 5bb7a90a..89905b01 100755 --- a/bin/heat-db-setup +++ b/bin/heat-db-setup @@ -129,7 +129,7 @@ done # Make sure MySQL is installed. NEW_MYSQL_INSTALL=0 -if ! $PACKAGE_STATUS mysql-server > /dev/null +if ! $PACKAGE_STATUS mysql-server && ! $PACKAGE_STATUS mariadb-server > /dev/null then if [ -z "${ASSUME_YES}" ] ; then printf "mysql-server is not installed. Would you like to install it now? (y/n): " -- 2.45.2