diff options
| author | Sergey Nikitin <snikitin@mirantis.com> | 2015-11-05 21:05:43 +0300 |
|---|---|---|
| committer | Pavel Kholkin <pkholkin@mirantis.com> | 2015-11-06 18:59:44 +0300 |
| commit | 80d7448e80ae4b9883ef0b9d24be5dbd09ee664c (patch) | |
| tree | 3b89cdc34f6a0b296e8c5278e186bfb770f40977 /nova/config.py | |
| parent | e52d236a3f1740997890cad9d4726df01d5a7e5d (diff) | |
| download | nova-80d7448e80ae4b9883ef0b9d24be5dbd09ee664c.tar.gz | |
Use EngineFacade from oslo_db.enginefacade
'get_session' and 'get_api_session' methods are still
needed for backward compatibility.
Implements: blueprint new-oslodb-enginefacade
Closes-Bug: #1502104
Co-Authored-By: Pavel Kholkin <pkholkin@mirantis.com>
Change-Id: I8ceb9f939470f744f0d616d7db065a4d5d80202b
Diffstat (limited to 'nova/config.py')
| -rw-r--r-- | nova/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/config.py b/nova/config.py index 4e0950a126..b3c9902efb 100644 --- a/nova/config.py +++ b/nova/config.py @@ -19,6 +19,7 @@ from oslo_config import cfg from oslo_db import options from oslo_log import log +from nova.db.sqlalchemy import api as sqlalchemy_api from nova import debugger from nova import paths from nova import rpc @@ -46,7 +47,7 @@ _DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d ' '%(message)s') -def parse_args(argv, default_config_files=None): +def parse_args(argv, default_config_files=None, configure_db=True): log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS) log.register_options(CONF) options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION, @@ -58,3 +59,6 @@ def parse_args(argv, default_config_files=None): version=version.version_string(), default_config_files=default_config_files) rpc.init(CONF) + + if configure_db: + sqlalchemy_api.configure(CONF) |