aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-06 18:37:29 +0000
committerGerrit Code Review <review@openstack.org>2017-06-06 18:37:29 +0000
commitd18e1a6b64f63c74764bf88c44afa4d24e17775d (patch)
treec7f0206efb1c4c94a777708d406a2cfb5a498c3b /environments/docker.yaml
parentda86aacb66eaa5e009206ed698a4189e8f5e0e1d (diff)
parent233a71c74e18e1a2377978b06b24cf892de7887c (diff)
Merge "Containerize HAProxy for the non-ha case"
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 36e4c39..5b03b08 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -27,6 +27,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::Redis: ../docker/services/database/redis.yaml