From e8926785c31da70bfb8bae2a4fe7764fd562de6d Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 26 Apr 2023 23:43:54 +0200
Subject: [PATCH] Tag 'services' should only deploy services

---
 roles/docker_services/tasks/config.yml   | 16 +---------------
 roles/docker_services/tasks/main.yml     |  1 -
 roles/docker_services/tasks/services.yml | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/roles/docker_services/tasks/config.yml b/roles/docker_services/tasks/config.yml
index c23bbdc..5fe9fd5 100644
--- a/roles/docker_services/tasks/config.yml
+++ b/roles/docker_services/tasks/config.yml
@@ -1,12 +1,5 @@
 # vim: ft=yaml.ansible
 ---
-- name: Create base directory for Docker volumes
-  ansible.builtin.file:
-    name: "{{ base_volume }}"
-    owner: root
-    mode: u=rwx,g=rx,o=rx
-    state: directory
-
 - name: Copy Docker daemon config file
   ansible.builtin.template:
     src: daemon.json.j2
@@ -23,11 +16,4 @@
   loop:
     - docker.socket
     - docker.service
-
-- name: Create Docker network for services
-  community.docker.docker_network:
-    name: services
-    ipam_config:
-      - subnet: 172.16.0.0/16
-        gateway: 172.16.0.1
-    state: present
+  when: "{{ stop is undefined or not stop }}"
diff --git a/roles/docker_services/tasks/main.yml b/roles/docker_services/tasks/main.yml
index 03d24e2..238c48b 100644
--- a/roles/docker_services/tasks/main.yml
+++ b/roles/docker_services/tasks/main.yml
@@ -40,7 +40,6 @@
 - name: Configure Docker
   ansible.builtin.import_tasks: config.yml
   tags:
-    - services
     - reboot
 
 - name: Set up Docker services
diff --git a/roles/docker_services/tasks/services.yml b/roles/docker_services/tasks/services.yml
index e4fecee..58d45d8 100644
--- a/roles/docker_services/tasks/services.yml
+++ b/roles/docker_services/tasks/services.yml
@@ -1,5 +1,20 @@
 # vim: ft=yaml.ansible
 ---
+- name: Create Docker network for services
+  community.docker.docker_network:
+    name: services
+    ipam_config:
+      - subnet: 172.16.0.0/16
+        gateway: 172.16.0.1
+    state: present
+
+- name: Create base directory for Docker volumes
+  ansible.builtin.file:
+    name: "{{ base_volume }}"
+    owner: root
+    mode: u=rwx,g=rx,o=rx
+    state: directory
+
 - name: Deploy services
   ansible.builtin.include_tasks: services/{{ item.key }}.yml
   loop: "{{ services | dict2items }}"