Merge "No-op Puppet for upgrades/migrations according to composable roles"

[apex-tripleo-heat-templates.git] / environments / network-environment.yaml

diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index d40ff47..d0fc9ec 100644 (file)
--- a/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@ -50,5 +50,7 @@ parameter_defaults:
   DnsServers: ["8.8.8.8","8.8.4.4"]
   # Set to empty string to enable multiple external networks or VLANs
   NeutronExternalNetworkBridge: "''"
+  # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
+  NeutronTunnelTypes: 'vxlan'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
   BondInterfaceOvsOptions: "bond_mode=active-backup"