Merge "Docker services for Cinder Backup"

[apex-tripleo-heat-templates.git] / environments / docker.yaml

diff --git a/environments/docker.yaml b/environments/docker.yaml
index 02cc6a0..4151c0d 100644 (file)
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -27,7 +27,6 @@ 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