aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2017-06-13 11:01:29 +0200
committerJiri Stransky <jistr@redhat.com>2017-06-13 11:01:29 +0200
commit6dbb8632ae5c558bb2356daa73da4f7a9ec6ee43 (patch)
treec73f10782b48cce03a5b79f38074da34496d64b1 /environments/docker.yaml
parent571778f2f001fccf5758254dc4c62deff809a71c (diff)
Unblock CI by reverting to non-containerized HAProxy
In change I90253412a5e2cd8e56e74cce3548064c06d022b1 we merged containerized HAProxy setup, but because of a typo in resource registry, CI kept using the non-containerized variant and it went unnoticed that the containerized HAProxy doesn't work yet. We merged a resource registry fix in Ibcbacff16c3561b75e29b48270d60b60c1eb1083 and it brought down the CI, which now used the non-working HAProxy. After putting in the missing haproxy container image to tripleo-common in I41c1064bbf5f26c8819de6d241dd0903add1bbaa we got further, but the CI still fails on HAProxy related problem, so we should revert back to using non-containerized HAProxy for the time being. Change-Id: If73bf28288de10812f430619115814494618860f Closes-Bug: #1697645
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 5cd1118..b9f8cd7 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