diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-06 14:41:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-06 14:41:43 +0000 |
| commit | b44c37c0af449e3dd4bf392b8b1e82f39d4b8b0a (patch) | |
| tree | bace4fb54c4bc535a33c02c26c1b44ed310f4a92 | |
| parent | c7ea24bbe8cdaa802b8077affc1073e3758912ec (diff) | |
| parent | c3da24303025f978c852dfde8babefd875322320 (diff) | |
| download | oslo-b44c37c0af449e3dd4bf392b8b1e82f39d4b8b0a.tar.gz oslo-b44c37c0af449e3dd4bf392b8b1e82f39d4b8b0a.tar.xz oslo-b44c37c0af449e3dd4bf392b8b1e82f39d4b8b0a.zip | |
Merge "Eliminate gratuitous DB difference vs Nova"
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index 5bd35c8..0effd5c 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -248,9 +248,8 @@ from eventlet import db_pool from eventlet import greenthread try: import MySQLdb - HAS_MYSQLDB = True except ImportError: - HAS_MYSQLDB = None + MySQLdb = None from sqlalchemy.exc import DisconnectionError, OperationalError, IntegrityError import sqlalchemy.interfaces import sqlalchemy.orm @@ -504,7 +503,7 @@ def create_engine(sql_connection): if CONF.sql_connection == "sqlite://": engine_args["poolclass"] = StaticPool engine_args["connect_args"] = {'check_same_thread': False} - elif all((CONF.sql_dbpool_enable, HAS_MYSQLDB, + elif all((CONF.sql_dbpool_enable, MySQLdb, "mysql" in connection_dict.drivername)): LOG.info(_("Using mysql/eventlet db_pool.")) # MySQLdb won't accept 'None' in the password field |