summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-08 15:57:18 -0400
committerDan Prince <dprince@redhat.com>2016-06-13 21:57:58 -0400
commitcf04308ee598b2a6d791c9b4834a746b8b373713 (patch)
treed75a67a2f1ea45aa32ff101a12a23241325dc652 /environments
parentdea033bca6997bff226391bf10c5afebcfd4dd18 (diff)
Composable Neutron Plumgrid plugin
Partially-implements: blueprint composable-services-within-roles Depends-On: I8536782d433f97a9b619e54a1eb1ea0edb8fdaf0 Change-Id: I3309997413998f1d90117e361d1578da3633e56c
Diffstat (limited to 'environments')
-rwxr-xr-xenvironments/neutron-plumgrid.yaml2
-rw-r--r--environments/puppet-pacemaker.yaml3
2 files changed, 5 insertions, 0 deletions
diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 23c088b2..333d44d1 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.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 Neutron core plugin to use PLUMgrid
+ OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
parameter_defaults:
NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index b139fc8d..32d0d914 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -24,6 +24,9 @@ resource_registry:
OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.yaml
OS::TripleO::Services::NeutronServer: ../puppet/services/pacemaker/neutron-server.yaml
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/pacemaker/neutron-plugin-ml2.yaml
+ # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
+ OS::TripleO::Services::NeutronCorePluginPlumgrid: ../puppet/services/pacemaker/neutron-plugin-plumgrid.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