diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-31 15:26:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-31 15:26:54 +0000 |
| commit | 865c65b8f43a909c94b1b50712b5baf088af9566 (patch) | |
| tree | 29c0636fe411f4aecbec4fef81427e98a2533fe8 /environments | |
| parent | 04d797c09e3ae3fbc0025dfc4dec30b2b44d4620 (diff) | |
| parent | 4645d9ce833197c42a563773cbf026d8853a4426 (diff) | |
Merge "Fix creation of iptables rules for non-HA containerized HAproxy"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/docker.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml index a7504611..2c09483a 100644 --- a/environments/docker.yaml +++ b/environments/docker.yaml @@ -32,6 +32,7 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml + OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml OS::TripleO::Services::MySQLClient: ../docker/services/database/mysql-client.yaml OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml |