openstack
/
neutron
Code Issues Proposed changes

Merge "Include [agent] extensions option into ovs/linuxbridge agent files"

This commit is contained in:
Jenkins 2016-08-25 04:32:13 +00:00 committed by Gerrit Code Review
parent b5e2902b17 3b38912e79
commit 69c41c547e
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)
]