openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] Load segments plugin in case not loaded in maintanance task"

This commit is contained in:
Zuul 2020-06-23 21:24:48 +00:00 committed by Gerrit Code Review
parent c6d02a1980 56f519f472
commit a8175c3e62
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View File

@ -29,6 +29,7 @@ from neutron.common.ovn import acl as acl_utils
from neutron.common.ovn import constants as ovn_const from neutron.common.ovn import constants as ovn_const
from neutron.common.ovn import utils from neutron.common.ovn import utils
from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf
from neutron import manager
from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import ovn_client from neutron.plugins.ml2.drivers.ovn.mech_driver.ovsdb import ovn_client
from neutron.services.segments import db as segments_db from neutron.services.segments import db as segments_db
@ -72,6 +73,10 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
self.l3_plugin = directory.get_plugin(plugin_constants.L3) self.l3_plugin = directory.get_plugin(plugin_constants.L3)
self._ovn_client = ovn_client.OVNClient(ovn_api, sb_ovn) self._ovn_client = ovn_client.OVNClient(ovn_api, sb_ovn)
self.segments_plugin = directory.get_plugin('segments') self.segments_plugin = directory.get_plugin('segments')
if not self.segments_plugin:
self.segments_plugin = (
manager.NeutronManager.load_class_for_provider(
'neutron.service_plugins', 'segments')())
def stop(self): def stop(self):
if utils.is_ovn_l3(self.l3_plugin): if utils.is_ovn_l3(self.l3_plugin):