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

The reason for reverting this is that when we tested this OVS
port is show as DOWN and it can actually send traffic.

An explanation is below:

The DHCP port has "tap" in the name, but doesn't appear to be
a tap device. It appears to be an OVS internal device. That device
was then put into a different network namespace, which isn't
visible to the root namespace in which ovs-vswitchd is running.
Using internal devices in this manor is kind of a hack since
ovs-vswitchd can't actually see the device, but it can still
send and receive traffic on it.

This reverts commit 850b4c025f.

Closes-bug: #1571553
Change-Id: I82d53d62bfd42cb17e3ce7f739369be3bbf44c02
This commit is contained in:
garyk 2016-04-17 07:12:29 +00:00 committed by Gary Kotton
parent 850b4c025f
commit dab6070caf
3 changed files with 1 additions and 10 deletions

View File

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

View File

@ -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 "

View File

@ -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.