adding anchor and moving docker networks back to setup_hosted_services

host_vars/qnap.yml

@@ -21,36 +21,52 @@ devices:
   - uuid: c528bf82-61ab-4f3d-87e0-d1e6e02ef7ec     # /dev/sdf
     path: /mnt/ssd0/
 
+# docker networks to be created before portainer stacks are created.
+external_docker_networks:
+  - mariadb_net
+
 services:
   - name: gitea
-    endpoint_id: 2
+    endpoint_id: &qnap_endpoint 2
+    template_vars:
+      image: gitea/gitea
+      tag: 1.16.9
   - name: mealie
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: linkding
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: overseerr
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: nextcloud
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
-    external_docker_networks:
+    template_vars:
-      - mariadb_net
+      default_network: mariadb_net
   - name: dashboards
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: nginx-proxy-manager
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: plex
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: uptime-kuma
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: vpn-stack
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}
   - name: mariadb
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
-    external_docker_networks:
+    template_vars:
-      - mariadb_net
+      default_network: mariadb_net
   - name: photoprism
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
-    external_docker_networks:
+    template_vars:
-      - mariadb_net
+      default_network: mariadb_net
   - name: olivetin
-    endpoint_id: 2
+    endpoint_id: *qnap_endpoint
+    template_vars: {}

roles/deploy_portainer_stack/defaults/main.yml

@@ -7,6 +7,3 @@ portainer_stack_directories: []
 
 # variables passed to the template function
 portainer_stack_template_vars: {}
-
-# list of docker networks which should be created
-portainer_stack_external_docker_networks: []

roles/deploy_portainer_stack/tasks/main.yml

@@ -52,13 +52,6 @@
     docker_backup_restore_latest_s3_key: true
     docker_backup_s3_restores: "{{ restore_volumes }}"
 
-- name: "Stack {{ portainer_stack_name }} | Create external docker networks."
-  docker_network:
-    name: '{{ docker_network }}'
-  loop: '{{ portainer_stack_external_docker_networks }}'
-  loop_control:
-    loop_var: docker_network
-
 - name: "Stack {{ portainer_stack_name }} | Update Portainer."
   chatton.portainer.portainer_stack:
     username: admin

roles/setup_hosted_services/tasks/main.yml

@@ -37,13 +37,17 @@
   notify:
     - restart-olivetin
 
+- name: Create external docker networks.
+  docker_network:
+    name: '{{ item }}'
+  with_items: '{{ external_docker_networks }}'
+
 - name: Deploy Portainer stacks.
   ansible.builtin.include_role:
     name: deploy_portainer_stack
   vars:
     portainer_stack_name: "{{ item.name }}"
     portainer_stack_endpoint_id: "{{ item.endpoint_id }}"
-    portainer_stack_external_docker_networks: "{{ item.external_docker_networks | default([]) }}"
     portainer_stack_template_vars: "{{ item.template_vars | default({}) }}"
   with_items: "{{ services }}"
 

roles/setup_hosted_services/templates/gitea.j2

@@ -6,7 +6,7 @@ services:
     labels:
       ie.cianhatton.backup.enabled: "true"
       ie.cianhatton.backup.schedule: "{{backups.schedule_keys.monthly}}"
-    image: gitea/gitea:1.16.9
+    image: "{{ template_vars.image }}:{{ template_vars.tag }}"
     container_name: gitea
     environment:
       - USER_UID=1000

roles/setup_hosted_services/templates/mariadb.j2

@@ -32,5 +32,5 @@ volumes:
 
 networks:
   default:
-    name: mariadb_net
+    name: {{ template_vars.default_network }}
     external: true

roles/setup_hosted_services/templates/nextcloud.j2

@@ -17,5 +17,5 @@ volumes:
 
 networks:
   default:
-    name: mariadb_net
+    name: {{ template_vars.default_network }}
     external: true

roles/setup_hosted_services/templates/photoprism.j2

@@ -50,5 +50,5 @@ services:
 
 networks:
   default:
-    name: mariadb_net
+    name: {{ template_vars.default_network }}
     external: true