From d2112530f54612eeccfa7880a699cab29868f9f8 Mon Sep 17 00:00:00 2001 From: Tamerlan Abu Date: Wed, 27 May 2020 19:03:19 +0600 Subject: [PATCH] No rpc_response_max_timeout in LB-agent Adds support for rpc_response_max_timeout in LB-agent. Change-Id: I1c5dcd1642019cb8c327722819f753b2b5b7137c Closes-Bug: #1880934 (cherry picked from commit edfe7daf047cbae3bc9d6a0a37ace091f6375e51) --- neutron/opts.py | 2 ++ .../ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/neutron/opts.py b/neutron/opts.py index 5280b2378ec..c4dc9e2ea3a 100644 --- a/neutron/opts.py +++ b/neutron/opts.py @@ -191,6 +191,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', diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index 08f7bfc6dd5..2efd7cefa67 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -41,6 +41,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 @@ -1031,6 +1032,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)