diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-14 12:56:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-14 12:56:12 +0000 |
| commit | 167d93eaa324cf176346b783db3380ff6f0cbf98 (patch) | |
| tree | a46d6de366d017c375adf555c016012b59c0afa5 /overcloud-resource-registry-puppet.yaml | |
| parent | 856a990b47d911806c89c31017b06f8c1dc71b87 (diff) | |
| parent | d91bb38e1d8686cbe9bc5f36ee282d0a6ac1b619 (diff) | |
Merge "Composable Pacemaker service"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 6ff34424..7630160d 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -159,6 +159,7 @@ resource_registry: 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::Pacemaker: OS::Heat::None OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml |