From 233a71c74e18e1a2377978b06b24cf892de7887c Mon Sep 17 00:00:00 2001 From: Damien Ciabrini Date: Wed, 19 Apr 2017 15:46:41 +0200 Subject: 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 Depends-on: I51c482b70731f15fee4025bbce14e46a49a49938 Closes-Bug: #1668936 --- environments/docker.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'environments/docker.yaml') diff --git a/environments/docker.yaml b/environments/docker.yaml index 755e94c2..07f704e4 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 -- cgit 1.2.3-korg