openstack
/
neutron
Code Issues Proposed changes

Merge "No rpc_response_max_timeout in LB-agent" into stable/stein

This commit is contained in:
Zuul 2020-07-01 05:33:22 +00:00 committed by Gerrit Code Review
parent f419724bca 1f1f45d65c
commit 4873f8f25c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/opts.py
View File

@ -181,6 +181,8 @@ def list_dhcp_agent_opts():
def list_linux_bridge_opts():
return [
('DEFAULT',
neutron.conf.service.RPC_EXTRA_OPTS),
('linux_bridge',
neutron.conf.plugins.ml2.drivers.linuxbridge.bridge_opts),
('vxlan',

3
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -42,6 +42,7 @@ from neutron.common import config as common_config
from neutron.common import profiler as setup_profiler
from neutron.common import utils
from neutron.conf.agent import common as agent_config
from neutron.conf import service as service_conf
from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
from neutron.plugins.ml2.drivers.agent import _common_agent as ca
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
@ -1032,6 +1033,8 @@ def main():
common_config.setup_logging()
agent_config.setup_privsep()
service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF)
try:
interface_mappings = helpers.parse_mappings(
cfg.CONF.LINUX_BRIDGE.physical_interface_mappings)