Merge "Fix compatibility with oslo.db 12.1.0"

This commit is contained in:
Zuul 2022-09-06 14:50:32 +00:00 committed by Gerrit Code Review
commit 1484946d24
1 changed files with 4 additions and 0 deletions

View File

@ -106,6 +106,10 @@ class Connection(base.Connection):
# in storage.__init__.get_connection_from_config function
options = dict(conf.database.items())
options['max_retries'] = 0
# FIXME(stephenfin): Remove this (and ideally use of
# LegacyEngineFacade) asap since it's not compatible with SQLAlchemy
# 2.0
options['autocommit'] = True
# oslo.db doesn't support options defined by Aodh
for opt in storage.OPTS:
options.pop(opt.name, None)