From: Jenkins Date: Mon, 6 Jun 2016 13:59:18 +0000 (+0000) Subject: Merge "Explode Loadbalancer role into HAproxy + keepalived" X-Git-Tag: opnfv-6.0.0~1960 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eef24da48592154bc29f748a09e7fd23ced9e776;p=apex-tripleo-heat-templates.git Merge "Explode Loadbalancer role into HAproxy + keepalived" --- eef24da48592154bc29f748a09e7fd23ced9e776 diff --cc environments/puppet-pacemaker.yaml index 7f261591,6f96b047..e6326453 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@@ -23,7 -23,6 +23,7 @@@ 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 + OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml + OS::TripleO::Services::NovaConductor: ../puppet/services/pacemaker/nova-conductor.yaml