From a1cab16238ef6c273a5fca9edaa3cfb13703bba8 Mon Sep 17 00:00:00 2001
From: Tom Neville <tomn@sneaky.net>
Date: Tue, 20 Jan 2026 18:41:56 -0500
Subject: [PATCH] Moving the creation of /etc/docker and
 /etc/docker/daemon.json to before the install.  The default-address-pools
 option must be in place for the install or docker will create the network
 with the wrong IP network.

---
 tasks/main.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 7b5033a6..003035c0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,6 +19,21 @@
 - include_tasks: setup-Debian.yml
   when: ansible_facts.os_family == 'Debian'
 
+- name: Ensure /etc/docker/ directory exists.
+  file:
+    path: /etc/docker
+    state: directory
+    mode: 0755
+  when: docker_daemon_options.keys() | length > 0
+
+- name: Configure Docker daemon options.
+  copy:
+    content: "{{ docker_daemon_options | to_nice_json }}"
+    dest: /etc/docker/daemon.json
+    mode: 0644
+  when: docker_daemon_options.keys() | length > 0
+  notify: restart docker
+
 - name: Install Docker packages.
   package:
     name: "{{ docker_packages }}"
@@ -53,21 +68,6 @@
   ignore_errors: "{{ ansible_check_mode }}"
   when: "docker_install_compose_plugin | bool == true and ansible_version.full is version_compare('2.12', '>=') and ansible_facts.os_family in ['RedHat', 'Debian']"
 
-- name: Ensure /etc/docker/ directory exists.
-  file:
-    path: /etc/docker
-    state: directory
-    mode: 0755
-  when: docker_daemon_options.keys() | length > 0
-
-- name: Configure Docker daemon options.
-  copy:
-    content: "{{ docker_daemon_options | to_nice_json }}"
-    dest: /etc/docker/daemon.json
-    mode: 0644
-  when: docker_daemon_options.keys() | length > 0
-  notify: restart docker
-
 - name: Replace Docker service ExecStart command if configured.
   when: docker_service_start_command != ""
   notify: restart docker