Merge "Explode Loadbalancer role into HAproxy + keepalived"

diff --cc environments/puppet-pacemaker.yaml
index 7f26159,6f96b04..e632645
--- 1/environments/puppet-pacemaker.yaml
--- 2/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

diff --cc overcloud-resource-registry-puppet.yaml
Simple merge

diff --cc overcloud.yaml
Simple merge