From 3b38912e79746764c4e0171a9ecc7e44183f929e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 12 Jul 2016 13:25:49 -0400 Subject: [PATCH] Include [agent] extensions option into ovs/linuxbridge agent files The option was introduced in Liberty. In Mitaka, we switched to using oslo-config-generator but missed including this specific option. The patch returns the option back. It should be backported to Mitaka. Change-Id: Ie4a4ea44eedac3d6c7ac1b6e0739f6c44212b2ea Closes-Bug: #1602358 --- neutron/opts.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/neutron/opts.py b/neutron/opts.py index 31f948de04d..3013e1d3a6d 100644 --- a/neutron/opts.py +++ b/neutron/opts.py @@ -187,7 +187,10 @@ def list_linux_bridge_opts(): ('vxlan', neutron.conf.plugins.ml2.drivers.linuxbridge.vxlan_opts), ('agent', - neutron.conf.plugins.ml2.drivers.agent.agent_opts), + itertools.chain( + neutron.conf.plugins.ml2.drivers.agent.agent_opts, + neutron.agent.agent_extensions_manager.AGENT_EXT_MANAGER_OPTS) + ), ('securitygroup', neutron.conf.agent.securitygroups_rpc.security_group_opts) ] @@ -276,8 +279,11 @@ def list_ovs_opts(): neutron.agent.ovsdb.api.OPTS) ), ('agent', - neutron.plugins.ml2.drivers.openvswitch.agent.common.config. - agent_opts), + itertools.chain( + neutron.plugins.ml2.drivers.openvswitch.agent.common.config. + agent_opts, + neutron.agent.agent_extensions_manager.AGENT_EXT_MANAGER_OPTS) + ), ('securitygroup', neutron.conf.agent.securitygroups_rpc.security_group_opts) ]