Merge "Add integration with Manila CephFS Native driver"

[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 9c073d8..32d50d4 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -48,12 +48,27 @@ parameters:
     description: >
         Remove configuration that is not generated by TripleO. Setting
         to false may result in configuration remnants after updates/upgrades.
+  NeutronGlobalPhysnetMtu:
+    type: number
+    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. 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
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -84,3 +99,4 @@ outputs:
         neutron::host: '"%{::fqdn}"'    #NOTE: extra quoting is needed
         neutron::db::database_db_max_retries: -1
         neutron::db::database_max_retries: -1
+        neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}