From 96371e6f1db7aa424a940c5219370f5dac9ea565 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 8 Oct 2020 14:27:15 +0200 Subject: [PATCH] Attempt to fix the portainer network management --- defaults/main.yml | 2 +- tasks/portainer.yml | 2 +- templates/portainer-agent-stack.yml.j2 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d45c2be..f4ee7db 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -17,7 +17,7 @@ docker_swarm_portainer_hostname: 'portainer-swarm.example.com' docker_swarm_portainer_additional_constraints: [] # - 'node.hostname != docker01' -docker_swarm_portainer_network: 'portainer_agent_network' +docker_swarm_portainer_network: 'agent_network' docker_swarm_portainer_http_port: '9000' docker_swarm_portainer_service_port: '8000' diff --git a/tasks/portainer.yml b/tasks/portainer.yml index 377affd..f2c0c91 100644 --- a/tasks/portainer.yml +++ b/tasks/portainer.yml @@ -6,7 +6,7 @@ - name: Create the overlay network that will be used by portainer docker_network: - name: '{{ docker_swarm_portainer_network }}' + name: 'portainer_{{ docker_swarm_portainer_network }}' driver: overlay scope: swarm diff --git a/templates/portainer-agent-stack.yml.j2 b/templates/portainer-agent-stack.yml.j2 index 0601659..493d835 100644 --- a/templates/portainer-agent-stack.yml.j2 +++ b/templates/portainer-agent-stack.yml.j2 @@ -7,7 +7,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/volumes:/var/lib/docker/volumes networks: - - '{{ docker_swarm_portainer_network }}' + - 'portainer_{{ docker_swarm_portainer_network }}' deploy: mode: global placement: @@ -26,7 +26,7 @@ services: volumes: - portainer_data:/data networks: - - '{{ docker_swarm_portainer_network }}' + - 'portainer_{{ docker_swarm_portainer_network }}' deploy: mode: replicated replicas: 1