diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-08-18 22:54:30 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-08-18 22:54:30 +0000 |
| commit | 407582f9fd1e97caa15a9fb043962cd2ff8e4f96 (patch) | |
| tree | c380a0f9d360ea20ffaa66991066d326b5d922f7 | |
| parent | 2cb2e71454373f6baa857c8d73122c485e18c4c3 (diff) | |
| parent | bbcb84a5fed2c537bd6d2143e344fa96f669d231 (diff) | |
| download | nova-407582f9fd1e97caa15a9fb043962cd2ff8e4f96.tar.gz nova-407582f9fd1e97caa15a9fb043962cd2ff8e4f96.tar.xz nova-407582f9fd1e97caa15a9fb043962cd2ff8e4f96.zip | |
Passes empty string instead of None to MySQLdb driver if the DB password isn't set.
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 4 |
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, |