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

diff --git a/bin/heat-db-setup b/bin/heat-db-setup
index 5bb7a90a0021ec9ef4ee7c3388e6c8a46b5703e8..89905b013f57de383d3e3b18025901bf88280cfb 100755 (executable)
--- 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): "