Merge "Updates and fixes to NIC config template routes"

diff --cc environments/network-environment.yaml
index cf94d7f,d40ff47..d0fc9ec
--- 1/environments/network-environment.yaml
--- 2/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@@ -32,21 -41,14 +41,16 @@@ parameter_defaults
    ExternalAllocationPools: [{'start': '10.0.0.10', 'end': '10.0.0.50'}]
    # Gateway router for the external network
    ExternalInterfaceDefaultRoute: 10.0.0.1
-   # Gateway router for the provisioning network (or Undercloud IP)
-   ControlPlaneDefaultRoute: 192.0.2.254
-   # Generally the IP of the Undercloud
-   EC2MetadataIp: 192.0.2.1
+   # Uncomment if using the Management Network (see network-management.yaml)
+   # ManagementNetCidr: 10.0.1.0/24
+   # ManagementAllocationPools: [{'start': '10.0.1.10', 'end', '10.0.1.50'}]
+   # Use either this parameter or ControlPlaneDefaultRoute in the NIC templates
+   # ManagementInterfaceDefaultRoute: 10.0.1.1
    # Define the DNS servers (maximum 2) for the overcloud nodes
    DnsServers: ["8.8.8.8","8.8.4.4"]
-   # Customize the VLAN IDs to match the local environment
-   InternalApiNetworkVlanID: 10
-   StorageNetworkVlanID: 20
-   StorageMgmtNetworkVlanID: 30
-   TenantNetworkVlanID: 40
-   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: "bond_mode=active-backup"