summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-12 17:42:05 +0000
committerGerrit Code Review <review@openstack.org>2016-07-12 17:42:05 +0000
commitde7d6fd004d364ffbae4741b93dde8e942181b4d (patch)
tree74c3a27ec72a4728508b9b6f598e89fcd7622bb3 /environments
parent91b00eaf8d520ff36007a8b5a74d3bc79c0b1eed (diff)
parent613e009d9f52e5a95a95e7e7ed2491ccc06e89d6 (diff)
Merge "Composable Plumgrid compute plugin"
Diffstat (limited to 'environments')
-rwxr-xr-xenvironments/neutron-plumgrid.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 78e7d912..87946211 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -9,7 +9,7 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the Neutron core plugin to use PLUMgrid
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
- OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-plumgrid.yaml
parameter_defaults:
NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2