From 850b4c025fa5652bfa474c78e7775d74fdb93df6 Mon Sep 17 00:00:00 2001
From: Kevin Benton <kevin@benton.pub>
Date: Wed, 24 Feb 2016 11:28:28 -0800
Subject: [PATCH] Deprecate 'ovs_use_veth' and 'veth_mtu' options

These were added to support an old kernel bug with
patch ports in OVS. This should no longer be an issue
with distros new enough ship Ocata.

Closes-Bug: #1550501
Change-Id: I8cd3d74f4d7dbe57fbff180d344f21534d590ce1
---
 neutron/agent/linux/interface.py                           | 1 +
 .../plugins/ml2/drivers/openvswitch/agent/common/config.py | 3 ++-
 .../notes/deprecate_ovs_use_veth-6336f10f38001106.yaml     | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/deprecate_ovs_use_veth-6336f10f38001106.yaml

diff --git a/neutron/agent/linux/interface.py b/neutron/agent/linux/interface.py
index 50e8ee96467..d69a167f9f1 100644
--- a/neutron/agent/linux/interface.py
+++ b/neutron/agent/linux/interface.py
@@ -37,6 +37,7 @@ OPTS = [
                help=_('Name of Open vSwitch bridge to use')),
     cfg.BoolOpt('ovs_use_veth',
                 default=False,
+                deprecated_for_removal=True,
                 help=_('Uses veth for an OVS interface or not. '
                        'Support kernels with limited namespace support '
                        '(e.g. RHEL 6.5) so long as ovs_use_veth is set to '
diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
index f5bbd327925..a3b8c384576 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
@@ -62,6 +62,7 @@ ovs_opts = [
                        "integration bridge as it won't be managed by the "
                        "agent anymore. Deprecated for ofagent.")),
     cfg.BoolOpt('use_veth_interconnection', default=False,
+                deprecated_for_removal=True,
                 help=_("Use veths instead of patch ports to interconnect the "
                        "integration bridge to physical networks. "
                        "Support kernel without Open vSwitch patch port "
@@ -110,7 +111,7 @@ agent_opts = [
                        "(gre and/or vxlan).")),
     cfg.PortOpt('vxlan_udp_port', default=p_const.VXLAN_UDP_PORT,
                 help=_("The UDP port to use for VXLAN tunnels.")),
-    cfg.IntOpt('veth_mtu', default=9000,
+    cfg.IntOpt('veth_mtu', default=9000, deprecated_for_removal=True,
                help=_("MTU size of veth interfaces")),
     cfg.BoolOpt('l2_population', default=False,
                 help=_("Use ML2 l2population mechanism driver to learn "
diff --git a/releasenotes/notes/deprecate_ovs_use_veth-6336f10f38001106.yaml b/releasenotes/notes/deprecate_ovs_use_veth-6336f10f38001106.yaml
new file mode 100644
index 00000000000..1ed93e7b340
--- /dev/null
+++ b/releasenotes/notes/deprecate_ovs_use_veth-6336f10f38001106.yaml
@@ -0,0 +1,7 @@
+---
+prelude: >
+    The 'ovs_use_veth', 'use_veth_interconnection', and 'veth_mtu'
+    options have been deprecated and will be removed in Ocata.
+deprecations:
+  - The 'ovs_use_veth', 'use_veth_interconnection', and 'veth_mtu'
+    options have been deprecated and will be removed in Ocata.