Merge "Revert "Deprecate 'ovs_use_veth' and 'veth_mtu' options""

neutron/agent/linux/interface.py

@@ -38,7 +38,6 @@ 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 '

neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py

@@ -62,7 +62,6 @@ 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 "
@@ -111,7 +110,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, deprecated_for_removal=True,
+    cfg.IntOpt('veth_mtu', default=9000,
                help=_("MTU size of veth interfaces")),
     cfg.BoolOpt('l2_population', default=False,
                 help=_("Use ML2 l2population mechanism driver to learn "

releasenotes/notes/deprecate_ovs_use_veth-6336f10f38001106.yaml

@@ -1,7 +0,0 @@
----
-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.