aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-25 02:29:10 +0000
committerGerrit Code Review <review@openstack.org>2017-01-25 02:29:10 +0000
commit38ac78ba5d302b9d99009336d80a7f19c938826b (patch)
tree8aa414c0e968a04d2a6e2a94acea895bbda61501 /overcloud-resource-registry-puppet.j2.yaml
parentf68362bfb914ec03cd541164d72956aff821ec93 (diff)
parentcf8c1ebdd3690477b3441559efff82a6b421e90a (diff)
Merge "pacemaker remote profile support"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index a5e43496..a1c711ce 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -159,6 +159,7 @@ resource_registry:
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::PacemakerRemote: OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None
OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml