Merge "Provide the rpc_response_max_timeout parameter to metadata-agent" into stable/victoria
This commit is contained in:
commit
f69300497e
|
@ -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)
|
||||
|
|
|
@ -244,7 +244,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)
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue