openstack
/
neutron
Code Issues Proposed changes

Add [metadata_rate_limiting] options to example config files 

The metadata_rate_limiting options were added during the previous
cycles[1] but these options were not added to the oslo.config entry
points thus are still missing from the example config files.

This change adds these options to the appropriate entry points so that
the options are picked up by oslo-config-generator.

These options were previously registered by metadata-agent which are
not using these options really. This change also removes that useless
registration.

[1] 5f4a41326d

Closes-Bug: #2044896
Change-Id: Ib4bea51e24063c275737cdd769ad07c621a845f6
This commit is contained in:
Takashi Kajinami 2023-11-28 09:42:48 +09:00
parent 56172ed5ae
commit d8a2f212f7
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/metadata_agent.py
View File

@ -33,9 +33,6 @@ def main():
meta.register_meta_conf_opts(meta.SHARED_OPTS)
meta.register_meta_conf_opts(meta.UNIX_DOMAIN_METADATA_PROXY_OPTS)
meta.register_meta_conf_opts(meta.METADATA_PROXY_HANDLER_OPTS)
meta.register_meta_conf_opts(meta.METADATA_RATE_LIMITING_OPTS,
cfg=cfg.CONF,
group=meta.RATE_LIMITING_GROUP)
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)

4
neutron/conf/agent/ovn/metadata/config.py
View File

@ -46,7 +46,9 @@ def list_metadata_agent_opts():
meta_conf.METADATA_PROXY_HANDLER_OPTS,
meta_conf.UNIX_DOMAIN_METADATA_PROXY_OPTS)
),
('ovs', OVS_OPTS)
('ovs', OVS_OPTS),
(meta_conf.RATE_LIMITING_GROUP,
meta_conf.METADATA_RATE_LIMITING_OPTS)
]

8
neutron/opts.py
View File

@ -236,7 +236,9 @@ def list_dhcp_agent_opts():
neutron.conf.agent.dhcp.DHCP_AGENT_OPTS,
neutron.conf.agent.dhcp.DHCP_OPTS,
neutron.conf.agent.dhcp.DNSMASQ_OPTS)
)
),
(meta_conf.RATE_LIMITING_GROUP,
meta_conf.METADATA_RATE_LIMITING_OPTS)
]
@ -274,7 +276,9 @@ def list_l3_agent_opts():
('agent',
neutron.conf.agent.agent_extensions_manager.AGENT_EXT_MANAGER_OPTS),
('network_log',
neutron.conf.services.logging.log_driver_opts)
neutron.conf.services.logging.log_driver_opts),
(meta_conf.RATE_LIMITING_GROUP,
meta_conf.METADATA_RATE_LIMITING_OPTS)
]