aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 03:58:25 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 03:58:25 +0000
commit23ec8e1509717bb230f77096d3892812f3e67c14 (patch)
tree047c18b0da5cfbdd743989741d8d4df022794173 /environments
parentf32de519adb072ee5ca38b01044f983ac4437444 (diff)
parent37bb689a0fe37e9365373dbd47291a4323d36bd7 (diff)
Merge "Composable opencontrail plugin"
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-opencontrail.yaml2
-rw-r--r--environments/puppet-pacemaker.yaml1
2 files changed, 3 insertions, 0 deletions
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