From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 6 Jun 2017 18:37:29 +0000 (+0000)
Subject: Merge "Containerize HAProxy for the non-ha case"
X-Git-Tag: opnfv-6.0.0~601
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d18e1a6b64f63c74764bf88c44afa4d24e17775d;p=apex-tripleo-heat-templates.git

Merge "Containerize HAProxy for the non-ha case"
---

d18e1a6b64f63c74764bf88c44afa4d24e17775d
diff --cc environments/docker.yaml
index 36e4c391,07f704e4..5b03b084
--- a/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