From bbcb84a5fed2c537bd6d2143e344fa96f669d231 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Thu, 18 Aug 2011 20:25:32 +0000
Subject: DB password should be an empty string for MySQLdb

---
 nova/db/sqlalchemy/session.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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,
-- 
cgit