From 488633b0851c6017895d333013745928b766d786 Mon Sep 17 00:00:00 2001
From: Vitaliy Levitski <vlevitski@maprtech.com>
Date: Fri, 20 Jan 2017 12:41:01 +0200
Subject: [PATCH] Fix Maria-DB installation for centos7

Closes-Bug: #1658703
Change-Id: If13a2008c1b349b22f2247479f9128987c8fe45b
---
 sahara/plugins/mapr/base/base_cluster_configurer.py   | 4 +++-
 sahara/plugins/mapr/resources/install_mysql.sh        | 7 +++++--
 sahara/plugins/mapr/resources/install_mysql_client.sh | 2 +-
 sahara/plugins/mapr/services/mysql/mysql.py           | 5 +++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sahara/plugins/mapr/base/base_cluster_configurer.py b/sahara/plugins/mapr/base/base_cluster_configurer.py
index 16bb1046..a9fd512f 100644
--- a/sahara/plugins/mapr/base/base_cluster_configurer.py
+++ b/sahara/plugins/mapr/base/base_cluster_configurer.py
@@ -218,7 +218,9 @@ class BaseConfigurer(ac.AbstractConfigurer):
                             name=_("Configure database"))
         def decorated():
             distro_name = cluster_context.distro.name
-            mysql.MySQL.install_mysql(mysql_instance, distro_name)
+            distro_version = cluster_context.distro_version
+            mysql.MySQL.install_mysql(mysql_instance, distro_name,
+                                      distro_version)
             mysql.MySQL.start_mysql_server(cluster_context)
             mysql.MySQL.create_databases(cluster_context, instances)
 
diff --git a/sahara/plugins/mapr/resources/install_mysql.sh b/sahara/plugins/mapr/resources/install_mysql.sh
index a9502124..f6363cac 100644
--- a/sahara/plugins/mapr/resources/install_mysql.sh
+++ b/sahara/plugins/mapr/resources/install_mysql.sh
@@ -15,8 +15,11 @@ if [ ! -f /etc/init.d/mysql* ]; then
         sudo service mysql restart
     elif [[ $1 == *"CentOS"* ]] || \
         [[ $1 == "RedHatEnterpriseServer" ]]; then
-        sudo yum install -y mysql-server
-        sudo yum install -y mysql-connector-java
+            if [[ $2 == "7" ]]; then
+                sudo yum install -y mariadb-server
+            else
+                sudo yum install -y mysql-server
+            fi
     elif [[ $1 == *"SUSE"* ]]; then
         sudo zypper mysql-server
     else
diff --git a/sahara/plugins/mapr/resources/install_mysql_client.sh b/sahara/plugins/mapr/resources/install_mysql_client.sh
index 63002589..6249765b 100644
--- a/sahara/plugins/mapr/resources/install_mysql_client.sh
+++ b/sahara/plugins/mapr/resources/install_mysql_client.sh
@@ -3,7 +3,7 @@
 if [[ $1 == *"Ubuntu"* ]]; then
     sudo apt-get install --force-yes -y mysql-client libmysql-java
 elif [[ $1 == *"CentOS"* ]] || [[ $1 == "RedHatEnterpriseServer" ]]; then
-    sudo yum install -y mysql mysql-connector-java
+    sudo yum install -y mysql
 elif [[ $1 == *"SUSE"* ]]; then
     sudo zypper install mysql-community-server-client mysql-connector-java
 else
diff --git a/sahara/plugins/mapr/services/mysql/mysql.py b/sahara/plugins/mapr/services/mysql/mysql.py
index 746ea06c..51d4a06d 100644
--- a/sahara/plugins/mapr/services/mysql/mysql.py
+++ b/sahara/plugins/mapr/services/mysql/mysql.py
@@ -202,5 +202,6 @@ class MySQL(s.Service):
         MySQL._execute_script(instance, script.remote_path, script.render())
 
     @staticmethod
-    def install_mysql(instance, distro_name):
-        g.run_script(instance, MySQL.MYSQL_INSTALL_SCRIPT, 'root', distro_name)
+    def install_mysql(instance, distro_name, distro_version):
+        g.run_script(instance, MySQL.MYSQL_INSTALL_SCRIPT, 'root', distro_name,
+                     distro_version.split('.')[0])