aboutsummaryrefslogtreecommitdiffstats
path: root/environments/neutron-midonet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-07-06 11:13:15 -0400
committerDan Prince <dprince@redhat.com>2016-07-12 09:48:30 -0400
commit2a6ae1bab53a9dc051d9b307da3ee8d8e8c2ebc3 (patch)
tree17ce9e81f8074db012957a35f4d6ee4bfb76e8c6 /environments/neutron-midonet.yaml
parentc4f27255c50a8afc737346db549b701515494f79 (diff)
Composable Neutron Core Compute Plugin
Create a new resource registry entry for a Neutron "compute plugin". For ML2 this may be the same os the NeutronComputePlugin but patches for other vendors will follow that require extra bits on nodes where VMs will be created. This patch removes the ML2 code from the compute role and instead uses the existing composable services. NOTE: we are able to remove the puppet resource chain to force OVS to get restarted due to puppet-neutron commit: Idb1332dd498bb3065720f2ccaf68e6b0e9fa80c3 which should resolve that issue. Co-Authored-By: Emilien Macchi <emilien@redhat.com> Depends-On: I95b9188607ab6c599ad4cde6faa1deb081618f3e Change-Id: I2496372ca6e6ba9f52e9a8bb6e8dc731c125af13
Diffstat (limited to 'environments/neutron-midonet.yaml')
-rw-r--r--environments/neutron-midonet.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml
index 90b98ae8..cdf5fb68 100644
--- a/environments/neutron-midonet.yaml
+++ b/environments/neutron-midonet.yaml
@@ -4,8 +4,10 @@ resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../net-config-linux-bridge.yaml # We have to avoid any ovs bridge. MidoNet is incompatible with its datapath
OS::TripleO::Services::NeutronL3Agent: 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::NeutronCorePluginMidonet
+ OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
EnableZookeeperOnController: true