commit b3d8822ec835f1ca7eb5d9742b28f2ece480b387
author armando-migliaccio <armamig@gmail.com> Fri Jun 12 07:54:03 2015 -0700
committer Armando Migliaccio <armamig@gmail.com> Fri Jun 12 16:42:32 2015 +0000
tree 81cdeeba9a32b6cf2541148268322426baff1478
parent 008f42a24c8843c92b9589a5c1e53c3cc6c4a35d

Revert "Revert "change the default to PyMYSQL""

Some projects (Neutron) seem to be affected more than others, so we should revert this
to allow for a more selective choice of the DB driver on a per project basis.

We can re-enable the use MySQL-python just for Neutron.

This reverts commit de8d29ed8ce4a26b61cbee48f9fe5418d5416a06.

Related-Bug: #1464612

Change-Id: I889f4f8b116c413b300ab9eecc7b428a9a4afb1a

lib/databases/mysql

diff --git a/lib/databases/mysql b/lib/databases/mysql
index 7cd2856..832c2ca 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -11,7 +11,7 @@
 MY_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
-MYSQL_DRIVER=${MYSQL_DRIVER:-MySQL-python}
+MYSQL_DRIVER=${MYSQL_DRIVER:-PyMySQL}
 # Force over to pymysql driver by default if we are using it.
 if is_service_enabled mysql; then
     if [[ "$MYSQL_DRIVER" == "PyMySQL" ]]; then