summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-16 00:38:32 +0000
committerGerrit Code Review <review@openstack.org>2016-11-16 00:38:32 +0000
commit713a2e88c17fa6d1b110b2ad61fefc7050215126 (patch)
tree20cdd7f12efe754b88d4e8045660a132e2bbd3c8 /puppet/services
parentf79b6b479a8993b7bf51639f10d2c9288d36e33e (diff)
parentc54d323ac3c3a6f8fecfedf71d6d0446a2599e8c (diff)
Merge "Revert "Adjust MTU to compensate for VLAN tag issue""
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/neutron-base.yaml7
1 files changed, 2 insertions, 5 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 6bb4ba08..0b2cef07 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