Merge lp:~rconradharris/nova/lp829019 into lp:~hudson-openstack/nova/trunk

[Rick Harris]

Passes empty string instead of None to MySQLdb driver if the DB password isn't set.

[Ed Leafe (ed-leafe)]

lgtm

review: Approve

[Matt Dietz (cerberus)]

sho'nuff

review: Approve

=== modified file 'nova/db/sqlalchemy/session.py'
--- nova/db/sqlalchemy/session.py	2011-08-11 18:36:29 +0000
+++ nova/db/sqlalchemy/session.py	2011-08-18 20:28:54 +0000
@@ -73,9 +73,11 @@
 
     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,