summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-19 22:21:37 +0000
committerGerrit Code Review <review@openstack.org>2016-05-19 22:21:37 +0000
commit19cdce68aea14abc98b56b7de3fe5f2e48f1aa3d (patch)
tree9dd7ffc266ad08272a424c6d841adab92f25b9a7 /environments
parent05720272733a8fa62713411673b233b416f3f3a1 (diff)
parent40ad2899106bc5e5c0cf34c40c9f391e19122a49 (diff)
Merge "Deploy Loadbalancer as a composable role"
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 61ad24bd..4dede42f 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -16,3 +16,4 @@ resource_registry:
OS::TripleO::Services::NeutronL3Agent: ../puppet/services/pacemaker/neutron-l3.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.yaml
OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
+ OS::TripleO::Services::Loadbalancer: ../puppet/services/pacemaker/loadbalancer.yaml