summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-08-18 20:25:32 +0000
committerRick Harris <rick.harris@rackspace.com>2011-08-18 20:25:32 +0000
commitbbcb84a5fed2c537bd6d2143e344fa96f669d231 (patch)
tree74594e3b40cba687a9016c50c5d5821e9127ac76
parentabf7e2f767e1e535f40550945af466436d0cf541 (diff)
downloadnova-bbcb84a5fed2c537bd6d2143e344fa96f669d231.tar.gz
nova-bbcb84a5fed2c537bd6d2143e344fa96f669d231.tar.xz
nova-bbcb84a5fed2c537bd6d2143e344fa96f669d231.zip
DB password should be an empty string for MySQLdb
-rw-r--r--nova/db/sqlalchemy/session.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py
index 07f281938..643e2338e 100644
--- a/nova/db/sqlalchemy/session.py
+++ b/nova/db/sqlalchemy/session.py
@@ -73,9 +73,11 @@ def get_engine():
elif MySQLdb and "mysql" in connection_dict.drivername:
LOG.info(_("Using mysql/eventlet db_pool."))
+ # MySQLdb won't accept 'None' in the password field
+ password = connection_dict.password or ''
pool_args = {
"db": connection_dict.database,
- "passwd": connection_dict.password,
+ "passwd": password,
"host": connection_dict.host,
"user": connection_dict.username,
"min_size": FLAGS.sql_min_pool_size,