aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-13 13:22:01 +0000
committerGerrit Code Review <review@openstack.org>2017-06-13 13:22:01 +0000
commit7234e656a75b771da11af61a1b4948c0b43548ee (patch)
tree73366103094dd85192d13e320a38883abfe1655d /environments
parent10a2d81185e5cdd9b8dbdea5d2886159757c7989 (diff)
parent6dbb8632ae5c558bb2356daa73da4f7a9ec6ee43 (diff)
Merge "Unblock CI by reverting to non-containerized HAProxy"
Diffstat (limited to 'environments')
-rw-r--r--environments/docker.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 5cd11184..b9f8cd75 100644
--- 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