openstack
/
neutron
Code Issues Proposed changes

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
This commit is contained in:
Ihar Hrachyshka 2016-07-12 13:25:49 -04:00
parent 96a371bf50
commit 3b38912e79
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/opts.py
View File

@ -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)
]