diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 17:37:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 17:37:44 +0000 |
| commit | 01e510b754a9bf37193af73e7f38770dd661683c (patch) | |
| tree | 4fcd9d2e1aa5898fddadefd62edc0ee0a24121a5 /overcloud-resource-registry-puppet.yaml | |
| parent | a31fc6c250683d5463dc9cba4db4f5e09f45dbb4 (diff) | |
| parent | 2a6ae1bab53a9dc051d9b307da3ee8d8e8c2ebc3 (diff) | |
Merge "Composable Neutron Core Compute Plugin"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 6bd3ec00..4ef15444 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -150,12 +150,16 @@ resource_registry: OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml OS::TripleO::Services::NeutronServer: puppet/services/neutron-server.yaml OS::TripleO::Services::NeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml + # can be the same as NeutronCorePlugin but some vendors install different + # things where VMs run + OS::TripleO::Services::ComputeNeutronCorePlugin: puppet/services/neutron-plugin-ml2.yaml # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin) OS::TripleO::Services::NeutronCorePluginPlumgrid: puppet/services/neutron-plugin-plumgrid.yaml OS::TripleO::Services::NeutronCorePluginNuage: puppet/services/neutron-plugin-nuage.yaml OS::TripleO::Services::NeutronCorePluginOpencontrail: puppet/services/neutron-plugin-opencontrail.yaml OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml OS::TripleO::Services::NeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml + OS::TripleO::Services::ComputeNeutronOvsAgent: puppet/services/neutron-ovs-agent.yaml OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml |