aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-12 17:43:29 +0000
committerGerrit Code Review <review@openstack.org>2016-07-12 17:43:29 +0000
commit50eaf849f89030068293bcd500d487b8b26ad30a (patch)
tree957859c05dc8421b60107ab78852616efc7ad6aa /environments
parentde7d6fd004d364ffbae4741b93dde8e942181b4d (diff)
parentb510cabb86d9e887e1f849fe56b98624d578f55b (diff)
Merge "Composable OpenContrail compute plugin"
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-opencontrail.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index d9d234bc..4895287e 100644
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -9,7 +9,7 @@ resource_registry:
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: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-opencontrail.yaml
parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2