From 61e617a764e6fe069b9b9cb2e48ea1ab0cea1a3b Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 1 Oct 2020 16:23:51 +0200 Subject: [PATCH] Add some defaults and fix the swarm manager check --- defaults/main.yml | 10 +++++++++- tasks/haproxy-docker-service.yml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ee6989a..f700933 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -30,8 +30,16 @@ haproxy_nagios_check: False haproxy_nagios_check_w: 70 haproxy_nagios_check_c: 90 -haproxy_check_interval: 3s +# Used by some other role as defaults, eg docker-swarm +haproxy_spread_checks: 5 +haproxy_connect_timeout: 10s +haproxy_client_timeout: 120s +haproxy_server_timeout: 480s +haproxy_global_keepalive_timeout: 10s +haproxy_client_keepalive_timeout: 5184000s haproxy_backend_maxconn: 2048 +haproxy_check_interval: 3s +haproxy_check_timeout: 2s haproxy_sysctl_conntrack_max: 131072 diff --git a/tasks/haproxy-docker-service.yml b/tasks/haproxy-docker-service.yml index a795621..4544bf1 100644 --- a/tasks/haproxy-docker-service.yml +++ b/tasks/haproxy-docker-service.yml @@ -12,5 +12,5 @@ recreate: smart run_once: True - when: docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node + when: docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node | bool tags: [ 'haproxy', 'docker_haproxy', 'docker_swarm', 'docker' ]