openstack
/
neutron
Code Issues Proposed changes

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

As a result of d92e71c2 the sync util can fail because it tries to
look up the ovsdb connection from the mechanism_manager under 'ovn'
but the sync util registers under 'ovn-sync'.

Change-Id: I6998b08672761a501e427aab5d581064d9425dde
Closes-Bug: #1876752
This commit is contained in:
Terry Wilson 2020-05-04 16:03:06 +00:00
parent bd20f8515d
commit 18dd0d4e55
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