From c54d323ac3c3a6f8fecfedf71d6d0446a2599e8c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 2 Nov 2016 10:43:58 +0000 Subject: Revert "Adjust MTU to compensate for VLAN tag issue" This reverts commit 4223b88b708e145c1dcdc38e4209ecc9029dd91f. The underlying neutron bug with native ofctl interface was fixed in Newton. We no longer need to dumb down deployment MTU to accommodate Neutron. Change-Id: I9082c2d198a02ac3321488df67a66d336556d64c --- puppet/services/neutron-base.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'puppet/services/neutron-base.yaml') diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 32d50d41..4eb417c0 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -50,16 +50,13 @@ parameters: to false may result in configuration remnants after updates/upgrades. NeutronGlobalPhysnetMtu: type: number - default: 1496 + default: 1500 description: | MTU of the underlying physical network. Neutron uses this value to calculate MTU for all virtual network components. For flat and VLAN networks, neutron uses this value without modification. For overlay networks such as VXLAN, neutron automatically subtracts the overlay - protocol overhead from this value. The default value of 1496 is - currently in effect to compensate for some additional overhead when - deploying with some network configurations (e.g. network isolation over - single network interfaces) + protocol overhead from this value. ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set -- cgit 1.2.3-korg