From: Zack Cerza <zack.cerza@inktank.com>
Date: Thu, 30 Oct 2014 22:32:09 +0000 (-0600)
Subject: Revert "Remove MySQL requirements"
X-Git-Tag: 1.1.0~1092
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9e4fd9b3b99314b72f7a6237ae7b30ad588a037;p=teuthology.git

Revert "Remove MySQL requirements"

This reverts commit c69051367069eab4dd608753e14ffc8cee75b50b.
---

diff --git a/bootstrap b/bootstrap
index 029289edc..c013433d6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -18,7 +18,7 @@ Linux)
         fi
         ;;
     Fedora)
-        for package in python-pip python-virtualenv libevent-devel libvirt-python; do
+        for package in python-pip python-virtualenv libevent-devel libvirt-python community-mysql-devel; do
 	    if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
 		missing="${missing:+$missing }$package"
 	    fi
diff --git a/requirements.txt b/requirements.txt
index dc7b8c094..daff42903 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # 0.14 switches to libev, that means bootstrap needs to change too
 gevent == 0.13.6
-# If you want to use teuthology-coverage:
-#MySQL-python == 1.2.3
+# 1.7.7 has AES-128-CBC support for SSH keys, that's needed
+MySQL-python == 1.2.3
 PyYAML
 argparse >= 1.2.1
 beanstalkc >= 0.2.0