Merge "Switch from MySQL-python to PyMySQL"

keystone/tests/unit/config_files/backend_ldap_sql.conf

@@ -2,7 +2,7 @@
 #For a specific location file based sqlite use:
 #connection = sqlite:////tmp/keystone.db
 #To Test MySQL:
-#connection = mysql://keystone:keystone@localhost/keystone?charset=utf8
+#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
 idle_timeout = 200

keystone/tests/unit/config_files/backend_multi_ldap_sql.conf

@@ -3,7 +3,7 @@ connection = sqlite://
 #For a file based sqlite use
 #connection = sqlite:////tmp/keystone.db
 #To Test MySQL:
-#connection = mysql://keystone:keystone@localhost/keystone?charset=utf8
+#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
 idle_timeout = 200

keystone/tests/unit/config_files/backend_mysql.conf

@@ -1,4 +1,4 @@
 #Used for running the Migrate tests against a live Mysql Server
 #See _sql_livetest.py
 [database]
-connection = mysql://keystone:keystone@localhost/keystone_test?charset=utf8
+connection = mysql+pymysql://keystone:keystone@localhost/keystone_test?charset=utf8

keystone/tests/unit/config_files/backend_sql.conf

@@ -2,7 +2,7 @@
 #For a specific location file based sqlite use:
 #connection = sqlite:////tmp/keystone.db
 #To Test MySQL:
-#connection = mysql://keystone:keystone@localhost/keystone?charset=utf8
+#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8
 #To Test PostgreSQL:
 #connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8
 idle_timeout = 200