From ed6409f7561d8612e216de93de896b9cc78524a6 Mon Sep 17 00:00:00 2001 From: Bob Fournier Date: Mon, 18 Jul 2016 18:21:27 -0400 Subject: 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 --- environments/puppet-tenant-vlan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'environments/puppet-tenant-vlan.yaml') diff --git a/environments/puppet-tenant-vlan.yaml b/environments/puppet-tenant-vlan.yaml index ed948bc5..45d2117a 100644 --- a/environments/puppet-tenant-vlan.yaml +++ b/environments/puppet-tenant-vlan.yaml @@ -1,4 +1,4 @@ parameter_defaults: NeutronNetworkType: vlan - NeutronEnableTunnelling: false + NeutronTunnelTypes: '' NeutronNetworkVLANRanges: datacentre:1:1000 -- cgit 1.2.3-korg