From cece1855730d056fbb29108a708067cff31fc3cf Mon Sep 17 00:00:00 2001 From: fumihiko kakuma Date: Fri, 15 Apr 2016 10:16:03 +0900 Subject: [PATCH] Update for removing ofagent Update document and configuration help. A release-note for removing ofagent is added in the following. I5dbcd38b0ccc156a6c1cbac4d7fa7f9d297ec466 Change-Id: I586c0d5a7f9d3b742e8c65ff7e2986fd5d837f94 Partial-Bug: #1521477 --- doc/source/stadium/sub_projects.rst | 3 +++ neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/source/stadium/sub_projects.rst b/doc/source/stadium/sub_projects.rst index d9ffe65e8d6..605eba51027 100644 --- a/doc/source/stadium/sub_projects.rst +++ b/doc/source/stadium/sub_projects.rst @@ -566,6 +566,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) diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py index a3b8c384576..1f55b0b3532 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py @@ -60,7 +60,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, deprecated_for_removal=True, help=_("Use veths instead of patch ports to interconnect the "