ed6409f756
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
26 lines
1.2 KiB
YAML
26 lines
1.2 KiB
YAML
# A Heat environment file which can be used to enable OpenContrail
|
|
# extensions, configured via puppet
|
|
resource_registry:
|
|
OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
|
|
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
|
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
|
|
# Override the NeutronCorePlugin to use Nuage
|
|
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginOpencontrail
|
|
OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-opencontrail.yaml
|
|
|
|
parameter_defaults:
|
|
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
|
|
NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
|
|
NeutronTunnelTypes: ''
|
|
|
|
# required params:
|
|
#ContrailApiServerIp:
|
|
#ContrailExtensions: ''
|
|
|
|
# optional params
|
|
# ContrailApiServerPort: 8082
|
|
# ContrailMultiTenancy: false
|