Merge "Containerize HAProxy for the non-ha case"

diff --cc environments/docker.yaml
index 36e4c39,07f704e..5b03b08
--- 1/environments/docker.yaml
--- 2/environments/docker.yaml
+++ b/environments/docker.yaml
@@@ -27,9 -26,9 +27,10 @@@ resource_registry
    OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml
    OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml
    OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
+   OS::TripleO::Services::HAProxy: ../docker/services/haproxy.yaml
    OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
    OS::TripleO::Services::MongoDb: ../docker/services/database/mongodb.yaml
 +  OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
    OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml
    OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml
    OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml