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 /puppet | |
| 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 'puppet')
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 7a97cd84..d52b8a26 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -9,9 +9,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - NeutronEnableTunnelling: - type: string - default: "True" NeutronEnableL2Pop: type: string description: > @@ -56,7 +53,6 @@ outputs: config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] - neutron::agents::ml2::ovs::enable_tunneling: {get_param: NeutronEnableTunnelling} neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop} neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR} neutron::agents::ml2::ovs::bridge_mappings: |