summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-14 12:56:12 +0000
committerGerrit Code Review <review@openstack.org>2016-07-14 12:56:12 +0000
commit167d93eaa324cf176346b783db3380ff6f0cbf98 (patch)
treea46d6de366d017c375adf555c016012b59c0afa5 /environments
parent856a990b47d911806c89c31017b06f8c1dc71b87 (diff)
parentd91bb38e1d8686cbe9bc5f36ee282d0a6ac1b619 (diff)
Merge "Composable Pacemaker service"
Diffstat (limited to 'environments')
-rw-r--r--environments/puppet-pacemaker.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 0d365fa2..00698c1d 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -33,6 +33,7 @@ resource_registry:
OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml
OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml
+ OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml
OS::TripleO::Services::NovaConductor: ../puppet/services/pacemaker/nova-conductor.yaml
OS::TripleO::Services::MongoDb: ../puppet/services/pacemaker/database/mongodb.yaml