From 63d48754f5f8d288acedc6df62386196edf295a8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 23 Mar 2021 11:46:34 +0900 Subject: [PATCH] Provide the rpc_response_max_timeout parameter to metadata-agent The rpc_response_max_timeout parameter is used in comminucation over messaging queue, thus should be available for metadata-agent which communicate with neutron-server over messaging queue. Change-Id: I4826edf16bbdf338af6e050b15b4ecce9f8ca6ae Closes-Bug: #1920842 (cherry picked from commit 7f5711f77b79fdaffd91f6ef299783b058d18ace) --- neutron/agent/metadata_agent.py | 3 +++ neutron/opts.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/neutron/agent/metadata_agent.py b/neutron/agent/metadata_agent.py index 7af058b8a11..e6265b42e1b 100644 --- a/neutron/agent/metadata_agent.py +++ b/neutron/agent/metadata_agent.py @@ -23,6 +23,7 @@ from neutron.common import config from neutron.common import utils from neutron.conf.agent import common as agent_conf from neutron.conf.agent.metadata import config as meta +from neutron.conf import service as service_conf LOG = logging.getLogger(__name__) @@ -33,6 +34,8 @@ def main(): meta.register_meta_conf_opts(meta.METADATA_PROXY_HANDLER_OPTS) cache.register_oslo_configs(cfg.CONF) agent_conf.register_agent_state_opts_helper(cfg.CONF) + service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF) + config.init(sys.argv[1:]) config.setup_logging() utils.log_opt_values(LOG) diff --git a/neutron/opts.py b/neutron/opts.py index c4dc9e2ea3a..396b990ddde 100644 --- a/neutron/opts.py +++ b/neutron/opts.py @@ -245,7 +245,8 @@ def list_metadata_agent_opts(): itertools.chain( meta_conf.SHARED_OPTS, meta_conf.METADATA_PROXY_HANDLER_OPTS, - meta_conf.UNIX_DOMAIN_METADATA_PROXY_OPTS) + meta_conf.UNIX_DOMAIN_METADATA_PROXY_OPTS, + neutron.conf.service.RPC_EXTRA_OPTS) ), ('agent', neutron.conf.agent.common.AGENT_STATE_OPTS) ]