diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-15 14:59:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-15 14:59:03 +0000 |
| commit | 6e59141e64ce862c831cbf253f2e8eb81b491461 (patch) | |
| tree | 45ca55e295ca8f422674b7d84a17217e6b610f6a /environments/network-environment.yaml | |
| parent | 443f641767297d682f34a7427bb7507779373ff5 (diff) | |
| parent | ed6409f7561d8612e216de93de896b9cc78524a6 (diff) | |
Merge "Remove NeutronEnableTunnelling from templates"
Diffstat (limited to 'environments/network-environment.yaml')
| -rw-r--r-- | environments/network-environment.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml index 062c7bee..cf94d7fc 100644 --- a/environments/network-environment.yaml +++ b/environments/network-environment.yaml @@ -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: "bond_mode=active-backup" |