From 446a7acf2c0565c3232a6703df3047d16443d158 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 16 Mar 2024 16:32:32 +0900 Subject: [PATCH] Add metadata options to generated ovn_agent.ini The ovn-agent process now loads these options for metadata extension. Change-Id: I3fcacc9d54e34746fd0ef55f5f74c9f4bd6fbf97 --- neutron/conf/agent/ovn/ovn_neutron_agent/config.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neutron/conf/agent/ovn/ovn_neutron_agent/config.py b/neutron/conf/agent/ovn/ovn_neutron_agent/config.py index 69c693d0dc7..6e08605f6be 100644 --- a/neutron/conf/agent/ovn/ovn_neutron_agent/config.py +++ b/neutron/conf/agent/ovn/ovn_neutron_agent/config.py @@ -16,6 +16,7 @@ import itertools import shlex +from neutron.conf.agent.metadata import config as meta_conf from neutron.conf.agent import ovsdb_api from neutron.conf.plugins.ml2.drivers.ovn import ovn_conf from oslo_config import cfg @@ -34,11 +35,16 @@ OVS_OPTS = [ def list_ovn_neutron_agent_opts(): return [ + ('DEFAULT', itertools.chain(meta_conf.SHARED_OPTS, + meta_conf.UNIX_DOMAIN_METADATA_PROXY_OPTS, + meta_conf.METADATA_PROXY_HANDLER_OPTS + )), ('ovn', ovn_conf.ovn_opts), ('ovs', itertools.chain(OVS_OPTS, ovsdb_api.API_OPTS, ) ), + (meta_conf.RATE_LIMITING_GROUP, meta_conf.METADATA_RATE_LIMITING_OPTS) ]