Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use provided qemu.conf in libvirt container"
[apex-tripleo-heat-templates.git]
/
environments
/
neutron-opencontrail.yaml
diff --git
a/environments/neutron-opencontrail.yaml
b/environments/neutron-opencontrail.yaml
index
4895287
..
51575b8
100644
(file)
--- a/
environments/neutron-opencontrail.yaml
+++ b/
environments/neutron-opencontrail.yaml
@@
-13,8
+13,8
@@
resource_registry:
parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
- NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.
plugin.LoadBalancerPlugin
- Neutron
EnableTunnelling: false
+ NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.
v2.plugin.LoadBalancerPluginV2
+ Neutron
TunnelTypes: ''
# required params:
#ContrailApiServerIp:
# required params:
#ContrailApiServerIp: