openstack
/
murano
Code Issues Proposed changes

Merge "Fix compatibility with oslo.db 12.1.0"

This commit is contained in:
Zuul 2022-10-12 03:55:43 +00:00 committed by Gerrit Code Review
parent ee066ee750 46b34c05b0
commit 12617f1627
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -1,4 +1,5 @@
- project:
queue: murano
templates:
- check-requirements
- openstack-cover-jobs
@ -14,7 +15,6 @@
- murano-grenade
- murano-tempest-api-ipv6-only
gate:
queue: murano
jobs:
- murano-tempest-api
- murano-tempest-api-ipv6-only

3
murano/db/session.py
View File

@ -37,6 +37,9 @@ def _create_facade_lazily():
global _LOCK, _FACADE
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:
if _FACADE is None:
_FACADE = db_session.EngineFacade.from_config(CONF,