From: Dan Mick <dan.mick@redhat.com>
Date: Sat, 30 Apr 2016 00:23:03 +0000 (-0700)
Subject: Use the appropriate package name for mysql/mariadb
X-Git-Tag: 1.1.0~616^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ffb3875ae626f463ad25191fb081b89daaa79848;p=teuthology.git

Use the appropriate package name for mysql/mariadb

Community package download isn't necessary; RHEL ships
mariadb and its -devel package

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index 393f99d57..553291afd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -36,20 +36,7 @@ Linux)
         fi
         ;;
     RedHatEnterpriseWorkstation|RedHatEnterpriseServer)
-        if ! rpm -q mysql-community-devel ; then
-             cat << EOM
-             Please install mysql-community devel package before running bootstrap
-             Reference document: http://dev.mysql.com/doc/refman/5.7/en/linux-installation-yum-repo.html
-             mysql Yum repo's exist in following location
-             http://dev.mysql.com/downloads/repo/yum/
-             and the Repo can be installed using (note below example is for v5.7)
-             yum localinstall http://dev.mysql.com/get/mysql57-community-release-el7-8.noarch.rpm
-             yum update metadata
-             yum install mysql-community-devel"
-EOM
-	    exit 1
-        fi
-        for package in python-pip python-virtualenv libev-devel libvirt-devel libffi-devel; do
+        for package in python-pip python-virtualenv mariadb-devel libev-devel libvirt-devel libffi-devel; do
 	    if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
 		missing="${missing:+$missing }$package"
 	    fi