diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-06-05 22:01:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-06-05 22:01:58 +0000 |
commit | 0ecd6a63a80b3d8c66bb0411b12e1c55ea73ca98 (patch) | |
tree | 8a515d71df4cc3b0f8cb84440f5931505c5a6c2b /doc/source | |
parent | ad10af347c6530e4cb33bf12ca80a39f5f34d214 (diff) | |
parent | fad6e5c2302811e8721123fa8e7f43a5bdecb068 (diff) | |
download | oslo-db-0ecd6a63a80b3d8c66bb0411b12e1c55ea73ca98.tar.gz |
Merge "Fix usage of oslo.config"
Diffstat (limited to 'doc/source')
-rw-r--r-- | doc/source/usage.rst | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/source/usage.rst b/doc/source/usage.rst index be9ff69..0e5a2f2 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -8,6 +8,7 @@ To use oslo.db in a project:: .. code:: python + from oslo.config import cfg from oslo.db.sqlalchemy import session as db_session _FACADE = None @@ -15,8 +16,7 @@ To use oslo.db in a project:: def _create_facade_lazily(): global _FACADE if _FACADE is None: - _FACADE = db_session.EngineFacade.from_config( - CONF.database.connection, CONF) + _FACADE = db_session.EngineFacade.from_config(cfg.CONF) return _FACADE def get_engine(): @@ -48,12 +48,10 @@ To use oslo.db in a project:: from oslo.config import cfg from oslo.db import api as db_api - CONF = cfg.CONF - CONF.import_opt('backend', 'oslo.db.options', group='database') _BACKEND_MAPPING = {'sqlalchemy': 'project.db.sqlalchemy.api'} - IMPL = db_api.DBAPI(CONF.database.backend, backend_mapping=_BACKEND_MAPPING) + IMPL = db_api.DBAPI.from_config(cfg.CONF, backend_mapping=_BACKEND_MAPPING) def get_engine(): return IMPL.get_engine() |