From e06bcc48f897a92d6d781e48758f0f190e8b5e93 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 13 Oct 2020 18:39:41 +0200 Subject: [PATCH] Fix the volume definition, add placement constraints to the postgresql image --- defaults/main.yml | 3 ++- templates/open-asfa-docker-compose.yml.j2 | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e9d91d6..1f189c2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,4 +13,5 @@ open_asfa_db_image: 'postgres:12-alpine' #open_asfa_db_pwd: 'set it in a vault file' open_asfa_db_name: 'asfadb' open_asfa_db_user: 'asfadb_user' -open_asfa_db_volume: 'asfa_pg_data' \ No newline at end of file +open_asfa_db_volume: 'asfa_pg_data' +open_asfa_db_constraints: '[node.labels.pg_data==asfa_server]' \ No newline at end of file diff --git a/templates/open-asfa-docker-compose.yml.j2 b/templates/open-asfa-docker-compose.yml.j2 index 1e830fd..5bd6935 100644 --- a/templates/open-asfa-docker-compose.yml.j2 +++ b/templates/open-asfa-docker-compose.yml.j2 @@ -58,9 +58,19 @@ services: POSTGRES_USER: postgres POSTGRES_PORT: 5432 PGDATA: /var/lib/postgresql/data/pg_data + deploy: + placement: + constraints: {{ open_asfa_db_constraints }} + restart_policy: + condition: always + delay: 5s + max_attempts: 3 + window: 120s + logging: + driver: 'journald' networks: {{ open_asfa_docker_network }}: volumes: - - {{ open_asfa_db_volume }}: + {{ open_asfa_db_volume }}: