Merge "Fix compatibility with oslo.db 12.1.0"
This commit is contained in:
commit
1484946d24
|
@ -106,6 +106,10 @@ class Connection(base.Connection):
|
||||||
# in storage.__init__.get_connection_from_config function
|
# in storage.__init__.get_connection_from_config function
|
||||||
options = dict(conf.database.items())
|
options = dict(conf.database.items())
|
||||||
options['max_retries'] = 0
|
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
|
# oslo.db doesn't support options defined by Aodh
|
||||||
for opt in storage.OPTS:
|
for opt in storage.OPTS:
|
||||||
options.pop(opt.name, None)
|
options.pop(opt.name, None)
|
||||||
|
|
Loading…
Reference in New Issue