openstack
/
neutron
Code Issues Proposed changes

Merge "Update for removing ofagent"

This commit is contained in:
Jenkins 2016-05-18 07:01:50 +00:00 committed by Gerrit Code Review
parent b3e7809421 cece185573
commit 0eed94a777
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/stadium/sub_projects.rst
View File

@ -596,6 +596,9 @@ OpenFlow Agent (ofagent)
* Launchpad: https://launchpad.net/networking-ofagent
* PyPI: https://pypi.python.org/pypi/networking-ofagent
Note: The networking-ofagent project has been removed in the Newton cycle
and the only stable branch is maintained until its EOL.
.. _networking-onos:
Open Network Operating System (onos)

2
neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
View File

@ -61,7 +61,7 @@ ovs_opts = [
"Note: If you remove a bridge from this "
"mapping, make sure to disconnect it from the "
"integration bridge as it won't be managed by the "
"agent anymore. Deprecated for ofagent.")),
"agent anymore.")),
cfg.BoolOpt('use_veth_interconnection', default=False,
help=_("Use veths instead of patch ports to interconnect the "
"integration bridge to physical networks. "