Merge "Fix compatibility with oslo.db 12.1.0"
This commit is contained in:
commit
12617f1627
|
@ -1,4 +1,5 @@
|
||||||
- project:
|
- project:
|
||||||
|
queue: murano
|
||||||
templates:
|
templates:
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
@ -14,7 +15,6 @@
|
||||||
- murano-grenade
|
- murano-grenade
|
||||||
- murano-tempest-api-ipv6-only
|
- murano-tempest-api-ipv6-only
|
||||||
gate:
|
gate:
|
||||||
queue: murano
|
|
||||||
jobs:
|
jobs:
|
||||||
- murano-tempest-api
|
- murano-tempest-api
|
||||||
- murano-tempest-api-ipv6-only
|
- murano-tempest-api-ipv6-only
|
||||||
|
|
|
@ -37,6 +37,9 @@ def _create_facade_lazily():
|
||||||
global _LOCK, _FACADE
|
global _LOCK, _FACADE
|
||||||
|
|
||||||
if _FACADE is None:
|
if _FACADE is None:
|
||||||
|
# FIXME(zigo): autocommit=True it's not compatible with
|
||||||
|
# SQLAlchemy 2.0, and will be removed in future
|
||||||
|
_FACADE = db_session.EngineFacade.from_config(CONF, autocommit=True)
|
||||||
with _LOCK:
|
with _LOCK:
|
||||||
if _FACADE is None:
|
if _FACADE is None:
|
||||||
_FACADE = db_session.EngineFacade.from_config(CONF,
|
_FACADE = db_session.EngineFacade.from_config(CONF,
|
||||||
|
|
Loading…
Reference in New Issue