diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-06-23 10:52:43 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-07-08 14:44:05 +0000 |
| commit | 800ee92b751ccdc8adc3375b765705f0c121f8d9 (patch) | |
| tree | b973bbdec637785919ac809964b63961fa63d570 /environments | |
| parent | 88f83fe8ccfa4cb080c482d87b54965218264535 (diff) | |
Composable Midonet for Neutron
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093
Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590
Partially-implements: blueprint composable-services-within-roles
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-midonet.yaml | 2 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml index 7f50f15b..90b98ae8 100644 --- a/environments/neutron-midonet.yaml +++ b/environments/neutron-midonet.yaml @@ -4,6 +4,8 @@ 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 + # Override the NeutronCorePlugin to use Nuage + OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet parameter_defaults: EnableZookeeperOnController: true diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index d1df6c41..8043ccbf 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -28,6 +28,7 @@ resource_registry: OS::TripleO::Services::NeutronCorePluginPlumgrid: ../puppet/services/pacemaker/neutron-plugin-plumgrid.yaml OS::TripleO::Services::NeutronCorePluginNuage: ../puppet/services/pacemaker/neutron-plugin-nuage.yaml OS::TripleO::Services::NeutronCorePluginOpencontrail: ../puppet/services/pacemaker/neutron-plugin-opencontrail.yaml + OS::TripleO::Services::NeutronCorePluginMidonet: ../puppet/services/pacemaker/neutron-midonet.yaml OS::TripleO::Services::NeutronOvsAgent: ../puppet/services/pacemaker/neutron-ovs-agent.yaml OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml |