Add Neutron network type and VLAN ranges to network-environment.yaml

The command-line options for Neutron network settings have been
deprecated in favor of setting parameter defaults in environment
files. This update includes the most common settings which were
previously set using CLI options in the sample
network-environment.yaml. This should also make it possible to
deploy in virtual environments without editing any files, since
the network-environment.yaml will include sane defaults.

Change-Id: Ieae59dfec287b9e5424a2e560de9f7b1bd598536

diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index d0fc9ec..b02fc19 100644 (file)
--- a/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@ -50,7 +50,12 @@ parameter_defaults:
   DnsServers: ["8.8.8.8","8.8.4.4"]
   # Set to empty string to enable multiple external networks or VLANs
   NeutronExternalNetworkBridge: "''"
+  # List of Neutron network types for tenant networks (will be used in order)
+  NeutronNetworkType: 'vxlan,vlan'
   # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
   NeutronTunnelTypes: 'vxlan'
+  # Neutron VLAN ranges per network, for example 'datacentre:1:499,tenant:500:1000':
+  NeutronNetworkVLANRanges: 'datacentre:1:1000'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
+  # for Linux bonds w/LACP, or "bond_mode=active-backup" for OVS active/backup.
   BondInterfaceOvsOptions: "bond_mode=active-backup"