From 140f32805c28c62300fb3f8a1bd004b5db3d7442 Mon Sep 17 00:00:00 2001
From: Ethan Lynn <xjunlin@cn.ibm.com>
Date: Wed, 26 Nov 2014 10:35:46 +0800
Subject: [PATCH] Fix package name when using heat-db-setup in rhel7

In rhel7 mysql-server is replaced by mariadb-server, using
the right name to install package.

Closes-Bug: #1395726
Change-Id: I02e79a6f8da5bd082568c22d3efc4c231dfbd8c7
---
 bin/heat-db-setup | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/heat-db-setup b/bin/heat-db-setup
index 6fad871489..130098f2bc 100755
--- a/bin/heat-db-setup
+++ b/bin/heat-db-setup
@@ -51,9 +51,9 @@ EOF
 
 install_mysql_server() {
 	if [ -z "${ASSUME_YES}" ] ; then
-		$PACKAGE_INSTALL mysql-server
+		$PACKAGE_INSTALL $DB_SERVER
 	else
-		$PACKAGE_INSTALL -y mysql-server
+		$PACKAGE_INSTALL -y $DB_SERVER
 	fi
 }
 
@@ -83,6 +83,15 @@ case "$1" in
 		PACKAGE_INSTALL="$ELEVATE yum install"
 		PACKAGE_STATUS="rpm -q"
 		SERVICE_MYSQLD="mysqld"
+		DB_SERVER="mysql-server"
+                # Install mariadb-server in rhel7 and fedora
+		if [[ -r /etc/redhat-release ]];then
+                   ver=`grep -E -o '[0-9]+([.]?[0-9])*' /etc/redhat-release`
+		   if [[ $ver >= 7 ]];then
+		       SERVICE_MYSQLD="mariadb"
+		       DB_SERVER="mariadb-server"
+		   fi
+		fi
 		SERVICE_START="$ELEVATE service $SERVICE_MYSQLD start"
 		SERVICE_STATUS="service $SERVICE_MYSQLD status"
 		SERVICE_ENABLE="$ELEVATE chkconfig"
@@ -92,6 +101,7 @@ case "$1" in
 		PACKAGE_INSTALL="$ELEVATE apt-get install"
 		PACKAGE_STATUS="dpkg-query -s"
 		SERVICE_MYSQLD="mysql"
+		DB_SERVER="mysql-server"
 		SERVICE_START="$ELEVATE service $SERVICE_MYSQLD start"
 		SERVICE_STATUS="$ELEVATE service $SERVICE_MYSQLD status"
 		SERVICE_ENABLE=""