Revert "Remove MySQL requirements"

This reverts commit c69051367069eab4dd608753e14ffc8cee75b50b.

diff --git a/bootstrap b/bootstrap
index 029289edc5830c28aa84bb1255dd055325f68e1f..c013433d6bd93eca0c9325176664583a41ff534b 100755 (executable)
--- 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 dc7b8c094ecc40c7c689dc6006134cc951c02e0b..daff4290369b78fe2cf8b24c8a7a4cbbba8ec19a 100644 (file)
--- 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