aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Sneddon <dsneddon@redhat.com>2016-11-01 15:03:06 -0700
committerDan Sneddon <dsneddon@redhat.com>2016-11-01 15:03:06 -0700
commit53ff813d95f464999d6b37b00572fe1ad58bcebb (patch)
tree1a5807f9bc01effe789071a38f72c79eaeb91705
parentd106161466ca158e4b663a89beda7af1d5b67d72 (diff)
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
-rw-r--r--environments/network-environment.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index d0fc9ec6..b02fc198 100644
--- 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"