diff options
| author |   Damien Ciabrini <dciabrin@redhat.com> | 2017-06-14 07:52:33 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-07-26 03:58:14 +0000 |
| commit | 4645d9ce833197c42a563773cbf026d8853a4426 (patch) | |
| tree | 4e4e15ce0a2bbfd8ab23c6146b71fda748fffbcc /environments | |
| parent | 8071beda51cdb71009ed071b36843b57a06d895b (diff) | |
Fix creation of iptables rules for non-HA containerized HAproxy
The introduction of I90253412a5e2cd8e56e74cce3548064c06d022b1 broke the HAproxy
service due to some HAproxy-specific iptables rules being executed during the
puppet config step.
Ensure that no iptables call is performed during the generation of configuration
files. Move those calls to step 1, as implemented in the pacemaker-based
HAproxy service (Ib5a083ba3299a82645f1a0f9da0d482c6b89ee23).
Depends-On: I2d6274d061039a9793ad162ed8e750bd87bf71e9
Closes-Bug: #1697921
Change-Id: Ica3a432ff4a9e7a46df22cddba9ad96e1390b665
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 |