openstack
/
neutron
Code Issues Proposed changes

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 7f5711f77b)
This commit is contained in:
Takashi Kajinami 2021-03-23 11:46:34 +09:00 committed by Stanislav Dmitriev
parent 31d6707988
commit ce2a1dc8a0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/metadata_agent.py
View File

@ -23,6 +23,7 @@ from neutron.common import config
from neutron.common import utils from neutron.common import utils
from neutron.conf.agent import common as agent_conf from neutron.conf.agent import common as agent_conf
from neutron.conf.agent.metadata import config as meta from neutron.conf.agent.metadata import config as meta
from neutron.conf import service as service_conf
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -33,6 +34,8 @@ def main():
meta.register_meta_conf_opts(meta.METADATA_PROXY_HANDLER_OPTS) meta.register_meta_conf_opts(meta.METADATA_PROXY_HANDLER_OPTS)
cache.register_oslo_configs(cfg.CONF) cache.register_oslo_configs(cfg.CONF)
agent_conf.register_agent_state_opts_helper(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.init(sys.argv[1:])
config.setup_logging() config.setup_logging()
utils.log_opt_values(LOG) utils.log_opt_values(LOG)

3
neutron/opts.py
View File

@ -244,7 +244,8 @@ def list_metadata_agent_opts():
itertools.chain( itertools.chain(
meta_conf.SHARED_OPTS, meta_conf.SHARED_OPTS,
meta_conf.METADATA_PROXY_HANDLER_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) ('agent', neutron.conf.agent.common.AGENT_STATE_OPTS)
] ]