openstack
/
neutron
Code Issues Proposed changes

Merge "Fix ovn-db-sync-util after removing l3 ovsdb connection"

This commit is contained in:
Zuul 2020-05-14 00:12:44 +00:00 committed by Gerrit Code Review
parent fc2ed6f477 18dd0d4e55
commit 21b5e5afc1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/cmd/ovn/neutron_ovn_db_sync_util.py
View File

@ -199,7 +199,11 @@ def main():
manager.init()
core_plugin = directory.get_plugin()
ovn_driver = core_plugin.mechanism_manager.mech_drivers['ovn-sync'].obj
driver = core_plugin.mechanism_manager.mech_drivers['ovn-sync']
# The L3 code looks for the OVSDB connection on the 'ovn' driver
# and will fail with a KeyError if it isn't there
core_plugin.mechanism_manager.mech_drivers['ovn'] = driver
ovn_driver = driver.obj
ovn_driver._nb_ovn = ovn_api
ovn_driver._sb_ovn = ovn_sb_api