From 37bb689a0fe37e9365373dbd47291a4323d36bd7 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 10 Jun 2016 15:42:22 -0400 Subject: Composable opencontrail plugin Partially-implements: blueprint composable-services-within-roles Change-Id: I17ac5dc2a6fb82a82d1db039e61fc8e87ba88333 --- environments/neutron-opencontrail.yaml | 2 ++ environments/puppet-pacemaker.yaml | 1 + 2 files changed, 3 insertions(+) (limited to 'environments') diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index b17c9c0a..36354bc9 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -7,6 +7,8 @@ resource_registry: OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None + # Override the NeutronCorePlugin to use Nuage + OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginOpencontrail parameter_defaults: NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 70998223..d1df6c41 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -27,6 +27,7 @@ resource_registry: # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin) 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::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 -- cgit 1.2.3-korg