summaryrefslogtreecommitdiffstats
path: root/environments/neutron-opencontrail.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-12 17:37:44 +0000
committerGerrit Code Review <review@openstack.org>2016-07-12 17:37:44 +0000
commit01e510b754a9bf37193af73e7f38770dd661683c (patch)
tree4fcd9d2e1aa5898fddadefd62edc0ee0a24121a5 /environments/neutron-opencontrail.yaml
parenta31fc6c250683d5463dc9cba4db4f5e09f45dbb4 (diff)
parent2a6ae1bab53a9dc051d9b307da3ee8d8e8c2ebc3 (diff)
Merge "Composable Neutron Core Compute Plugin"
Diffstat (limited to 'environments/neutron-opencontrail.yaml')
-rw-r--r--environments/neutron-opencontrail.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index 340bac78..d9d234bc 100644
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -6,8 +6,10 @@ resource_registry:
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: OS::Heat::None
parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2