diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-15 05:20:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-15 05:20:12 +0000 |
| commit | 07586ca090cf2e8257aec654709e76b3177e8572 (patch) | |
| tree | 5873eae25be91e7425a4068c905fe1b7cee19799 /environments | |
| parent | 708bf15975d8bfb4b7bc9426a86369d82c0d4dd9 (diff) | |
| parent | cf04308ee598b2a6d791c9b4834a746b8b373713 (diff) | |
Merge "Composable Neutron Plumgrid plugin"
Diffstat (limited to 'environments')
| -rwxr-xr-x | environments/neutron-plumgrid.yaml | 2 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 3 |
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 5b1afe65..52a94d80 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 |