From 5c110ab15496a05cd3b2b3127287c2616f354cbb Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 8 Oct 2020 13:45:41 +0200 Subject: [PATCH] portainer: the network creation has its own task --- defaults/main.yml | 2 +- tasks/portainer.yml | 6 ++++++ templates/portainer-agent-stack.yml.j2 | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f4ee7db..d45c2be 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: 'agent_network' +docker_swarm_portainer_network: 'portainer_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 936de60..377affd 100644 --- a/tasks/portainer.yml +++ b/tasks/portainer.yml @@ -4,6 +4,12 @@ - name: Install the portainer docker stack configuration template: src=portainer-agent-stack.yml.j2 dest=/srv/portainer-agent-stack.yml owner=root group=root mode='0444' + - name: Create the overlay network that will be used by portainer + docker_network: + name: '{{ docker_swarm_portainer_network }}' + driver: overlay + scope: swarm + - name: Run the docker stack to start portainer docker_stack: state: present diff --git a/templates/portainer-agent-stack.yml.j2 b/templates/portainer-agent-stack.yml.j2 index a348102..0601659 100644 --- a/templates/portainer-agent-stack.yml.j2 +++ b/templates/portainer-agent-stack.yml.j2 @@ -47,10 +47,5 @@ services: driver: 'journald' {% endif %} -networks: - {{ docker_swarm_portainer_network }}: - driver: overlay - attachable: true - volumes: portainer_data: