diff --git a/neutron/conf/plugins/ml2/drivers/ovs_conf.py b/neutron/conf/plugins/ml2/drivers/ovs_conf.py index eb213b62b16..ef41c05bb3d 100644 --- a/neutron/conf/plugins/ml2/drivers/ovs_conf.py +++ b/neutron/conf/plugins/ml2/drivers/ovs_conf.py @@ -188,6 +188,10 @@ agent_opts = [ cfg.PortOpt('vxlan_udp_port', default=n_const.VXLAN_UDP_PORT, help=_("The UDP port to use for VXLAN tunnels.")), cfg.IntOpt('veth_mtu', default=9000, + deprecated_for_removal=True, + deprecated_since="Yoga", + deprecated_reason="This parameter has had no effect since " + "the Wallaby release.", help=_("MTU size of veth interfaces")), cfg.BoolOpt('l2_population', default=False, help=_("Use ML2 l2population mechanism driver to learn " diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py index f75c6080545..0d4b2c58c26 100644 --- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py @@ -169,7 +169,6 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin, datapath_type=ovs_conf.datapath_type) for b in ('br_int', 'br_phys', 'br_tun')) - self.veth_mtu = agent_conf.veth_mtu self.available_local_vlans = set(range(n_const.MIN_VLAN_TAG, n_const.MAX_VLAN_TAG + 1)) self.tunnel_types = agent_conf.tunnel_types or [] diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py index a452cf40374..0e3b0c0d89b 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py +++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py @@ -66,8 +66,6 @@ class DummyVlanBinding(object): class TunnelTest(object): - VETH_MTU = None - def setUp(self): super(TunnelTest, self).setUp() self.useFixture(test_vlanmanager.LocalVlanManagerFixture()) @@ -313,7 +311,6 @@ class TunnelTest(object): cfg.CONF.set_override('bridge_mappings', self.NET_MAPPING, 'OVS') cfg.CONF.set_override('polling_interval', 2, 'AGENT') cfg.CONF.set_override('tunnel_types', ['gre'], 'AGENT') - cfg.CONF.set_override('veth_mtu', self.VETH_MTU, 'AGENT') cfg.CONF.set_override('minimize_polling', False, 'AGENT') cfg.CONF.set_override('enable_ipv6', False, 'DHCP') diff --git a/releasenotes/notes/deprecate-agent-veth_mtu-748ca450e32ea192.yaml b/releasenotes/notes/deprecate-agent-veth_mtu-748ca450e32ea192.yaml new file mode 100644 index 00000000000..c808afb2b2f --- /dev/null +++ b/releasenotes/notes/deprecate-agent-veth_mtu-748ca450e32ea192.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The ``[agent] veth_mtu`` parameter of ML2 OVS mechanism driver + configuration has been deprecated. This parameter has had no effect since + the Wallaby release.