diff options
author | 2016-06-21 08:57:50 +0000 | |
---|---|---|
committer | 2016-06-21 08:57:50 +0000 | |
commit | 2059931c70b8968eccf2a58de48623503b22095b (patch) | |
tree | c64b02b33e7d6e7b0e6e054d58d5958912d97264 /environments/puppet-pacemaker.yaml | |
parent | 9c16693ef8c47981a209f5b37b88d95a3e72cbab (diff) | |
parent | 9e502fc07d4520c873cde64dfd01a901cd271274 (diff) |
Merge "Composable neutron nuage plugin"
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
-rw-r--r-- | environments/puppet-pacemaker.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 52a94d80..70998223 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -26,7 +26,7 @@ resource_registry: 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::NeutronCorePluginNuage: ../puppet/services/pacemaker/neutron-plugin-nuage.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 |