summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-12 17:41:20 +0000
committerGerrit Code Review <review@openstack.org>2016-07-12 17:41:20 +0000
commit91b00eaf8d520ff36007a8b5a74d3bc79c0b1eed (patch)
tree78b852de5093910a8102f3c0e7ebf99b8da1a1dc /environments
parente9df98a8fb4105c9d039b071e951a3aabd8e9025 (diff)
parentbf76cf6c706682047747956304f1e7643a816212 (diff)
Merge "Composable Midonet compute plugin"
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-midonet.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml
index cdf5fb68..c120d0b3 100644
--- a/environments/neutron-midonet.yaml
+++ b/environments/neutron-midonet.yaml
@@ -7,7 +7,7 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
- OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-midonet.yaml
parameter_defaults:
EnableZookeeperOnController: true