aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorDamien Ciabrini <dciabrin@redhat.com>2017-04-19 15:46:41 +0200
committerDamien <dciabrin@redhat.com>2017-06-06 04:59:16 -0400
commit233a71c74e18e1a2377978b06b24cf892de7887c (patch)
treeff32ae3ab8d3453e3fcc58065d6e699a7c2d21e1 /environments/docker.yaml
parent56c8f120770b63b5518d3738ed56de626d24eb80 (diff)
Containerize HAProxy for the non-ha case
This change implements an initial container for haproxy in the non-HA case (aka when the container is not spawn by pacemaker). We tested this using a stock kolla haproxy container image and we were able to get haproxy running on a container with net=host correctly. Change-Id: I90253412a5e2cd8e56e74cce3548064c06d022b1 Co-Authored-By: Michele Baldessari <michele@acksyn.org> Depends-on: I51c482b70731f15fee4025bbce14e46a49a49938 Closes-Bug: #1668936
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 755e94c..07f704e 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -26,6 +26,7 @@ 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::Memcached: ../docker/services/memcached.yaml