summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-30 19:15:02 +0000
committerGerrit Code Review <review@openstack.org>2016-11-30 19:15:03 +0000
commit9cd0c5a50c45bfce9dabc64aafa3188ba9bdd13c (patch)
tree7243ea7b23cebfc38871a23b9ec416f66c468915
parent6df32707e9698da5a647aff2b20e6fc2617ea1d2 (diff)
parent53ff813d95f464999d6b37b00572fe1ad58bcebb (diff)
Merge "Add Neutron network type and VLAN ranges to network-environment.yaml"
-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"