From 8a3a8c322daf0c94e3a9b8efbaf506300a470b73 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 5 Oct 2020 17:40:59 +0200
Subject: [PATCH] Do not connect to any network while deploying.

---
 defaults/main.yml                     |  2 ++
 templates/haproxy-docker-stack.yml.j2 | 12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index d2337aa..882b72a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -11,6 +11,8 @@ haproxy_docker_container: False
 haproxy_docker_version: '{{ haproxy_version }}.4'
 haproxy_docker_image: 'haproxytech/haproxy-debian:{{ haproxy_version }}.4'
 haproxy_docker_compose_dir: /srv/haproxy_swarm
+haproxy_docker_restart_policy: 'on-failure'
+
 haproxy_ha_with_keepalived: False
 haproxy_docker_swarm_networks:
   - 'portainer_{{ docker_swarm_portainer_network }}'
diff --git a/templates/haproxy-docker-stack.yml.j2 b/templates/haproxy-docker-stack.yml.j2
index c677ffd..b7f4b76 100644
--- a/templates/haproxy-docker-stack.yml.j2
+++ b/templates/haproxy-docker-stack.yml.j2
@@ -32,13 +32,6 @@ services:
         mode: host
 {% endif %}
     dns: [127.0.0.11]
-    networks:
-{% for net in haproxy_docker_swarm_networks %}
-      - {{ net }}
-{% endfor %}
-{% for othernet in haproxy_docker_swarm_additional_networks %}
-      - {{ othernet }}
-{% endfor %}
     deploy:
 {% if docker_swarm_haproxy_installation_type == 'keepalive' or docker_swarm_haproxy_installation_type == 'mesh' %}
       mode: replicated
@@ -46,6 +39,9 @@ services:
 {% endif %}
 {% if docker_swarm_haproxy_installation_type == 'global' %}
       mode: global
+      update_config:
+        parallelism: 1
+        delay: 20s
 {% endif %}
       placement:
         constraints:
@@ -53,7 +49,7 @@ services:
           - {{ constr }}
 {% endfor %}
       restart_policy:
-        condition: on-failure
+        condition: {{ haproxy_docker_restart_policy}}
         delay: 20s
         max_attempts: 5
         window: 120s