Merge "Remove deprecated hdp plugin and add ambari"

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

diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index 005310c..cf94d7f 100644 (file)
--- a/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@ -22,7 +22,7 @@ parameter_defaults:
   TenantNetCidr: 172.16.0.0/24
   ExternalNetCidr: 10.0.0.0/24
   # CIDR subnet mask length for provisioning network
-  ControlPlaneSubnetCidr: 24
+  ControlPlaneSubnetCidr: '24'
   # Customize the IP ranges on each network to use for static IPs and VIPs
   InternalApiAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}]
   StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}]
@@ -46,5 +46,7 @@ parameter_defaults:
   ExternalNetworkVlanID: 50
   # 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: "mode=active-backup"
+  BondInterfaceOvsOptions: "bond_mode=active-backup"