openstack
/
neutron
Code Issues Proposed changes

Merge "[OVS] Do not shadow "l2_agent_extensions_manager" module"

This commit is contained in:
Zuul 2022-04-27 08:33:51 +00:00 committed by Gerrit Code Review
parent 26669ebbee 141f372c82
commit 6db61d0704
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -52,7 +52,7 @@ from neutron.agent.common import ip_lib
from neutron.agent.common import ovs_lib
from neutron.agent.common import polling
from neutron.agent.common import utils
from neutron.agent.l2 import l2_agent_extensions_manager as ext_manager
from neutron.agent.l2 import l2_agent_extensions_manager
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as agent_sg_rpc
from neutron.api.rpc.callbacks import resources
@ -2876,11 +2876,11 @@ def validate_tunnel_config(tunnel_types, local_ip):
def main(bridge_classes):
ovs_capabilities.register()
ext_manager.register_opts(cfg.CONF)
l2_agent_extensions_manager.register_opts(cfg.CONF)
agent_config.setup_privsep()
service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF)
ext_mgr = ext_manager.L2AgentExtensionsManager(cfg.CONF)
ext_mgr = l2_agent_extensions_manager.L2AgentExtensionsManager(cfg.CONF)
# now that all extensions registered their options, we can log them
n_utils.log_opt_values(LOG)