diff options
| author |   Bob Fournier <bfournie@redhat.com> | 2016-07-18 18:21:27 -0400 |
|---|---|---|
| committer |   Brent Eagles <beagles@redhat.com> | 2016-08-12 20:46:38 -0230 |
| commit | ed6409f7561d8612e216de93de896b9cc78524a6 (patch) | |
| tree | 1536352e020ffa9f1a4e797dc9d965750b17317c /environments/network-environment.yaml | |
| parent | 8c61510e601473cabd60264eff7fc5b6f9f2ebb8 (diff) | |
Remove NeutronEnableTunnelling from templates
As described in https://bugs.launchpad.net/tripleo/+bug/1532830,
the OVS agent no longer uses enable_tunneling, which is controlled by
NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling
from the Heat templates.
This change depends on NeutronEnableTunnelling also being removed
from python-tripleoclient and puppet-neutron no longer using the
enable_tunneling hieradata.
Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b
Closes-Bug: 1532830
Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a
Depends-On: I73630653330c67444827f32740c44e9d25b5db31
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" |