openstack/devstack
Code Issues Proposed changes

Revert "Revert "change the default to PyMYSQL""

Browse Source 
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 de8d29ed8c.

Related-Bug: #1464612

Change-Id: I889f4f8b116c413b300ab9eecc7b428a9a4afb1a
This commit is contained in:
armando-migliaccio 2015-06-12 07:54:03 -07:00 committed by Armando Migliaccio
parent 008f42a24c
commit b3d8822ec8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/databases/mysql
View File

@ -11,7 +11,7 @@
MY_XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o 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. # Force over to pymysql driver by default if we are using it.
if is_service_enabled mysql; then if is_service_enabled mysql; then
if [[ "$MYSQL_DRIVER" == "PyMySQL" ]]; then if [[ "$MYSQL_DRIVER" == "PyMySQL" ]]; then