Merge "Removes EnableODL heat parameter and fixes missing local_ip param"

[apex-tripleo-heat-templates.git] / puppet / services / neutron-base.yaml

diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 4eb417c..6bb4ba0 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -33,7 +33,7 @@ parameters:
         from neutron.core_plugins namespace.
     type: string
   NeutronServicePlugins:
-    default: "router,qos"
+    default: "router,qos,trunk"
     description: |
         Comma-separated list of service plugin entrypoints to be loaded from the
         neutron.service_plugins namespace.
@@ -50,13 +50,16 @@ parameters:
         to false may result in configuration remnants after updates/upgrades.
   NeutronGlobalPhysnetMtu:
     type: number
-    default: 1500
+    default: 1496
     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.
+        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)
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set