From 951b919d3020532a1e3d18a863d23438d7a73526 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Fri, 25 Jan 2019 13:09:04 +0100
Subject: [PATCH] Fix: for 18.09.x

 - add an override for docker.service (param -H fd://) conflicts qith /etc/docker/daemon.json
 - refactor code to "with_items" for containerd/docker
---
 tasks/docker-1809-shim.yml                       | 16 +++++++++++-----
 ...rride.conf.j2 => override-containerd.conf.j2} |  0
 templates/override-docker.conf.j2                |  4 ++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 rename templates/{override.conf.j2 => override-containerd.conf.j2} (100%)
 create mode 100644 templates/override-docker.conf.j2

diff --git a/tasks/docker-1809-shim.yml b/tasks/docker-1809-shim.yml
index 286254b..0c9045b 100644
--- a/tasks/docker-1809-shim.yml
+++ b/tasks/docker-1809-shim.yml
@@ -1,13 +1,19 @@
 ---
-- name: Ensure containerd service dir exists.
+- name: Ensure service directories exist.
   file:
-    path: /etc/systemd/system/containerd.service.d
+    path: /etc/systemd/system/{{ item }}
     state: directory
+  with_items:
+    - containerd.service.d
+    - docker.service.d
 
-- name: Add shim to ensure Docker can start in all environments.
+- name: Add overrides.
   template:
-    src: override.conf.j2
-    dest: /etc/systemd/system/containerd.service.d/override.conf
+    src: "override-{{ item }}.conf.j2"
+    dest: /etc/systemd/system/{{ item }}.service.d/override.conf
+  with_items:
+    - containerd
+    - docker
   register: override_template
 
 - name: Reload systemd daemon if template is changed.
diff --git a/templates/override.conf.j2 b/templates/override-containerd.conf.j2
similarity index 100%
rename from templates/override.conf.j2
rename to templates/override-containerd.conf.j2
diff --git a/templates/override-docker.conf.j2 b/templates/override-docker.conf.j2
new file mode 100644
index 0000000..1f20bfd
--- /dev/null
+++ b/templates/override-docker.conf.j2
@@ -0,0 +1,4 @@
+# {{ ansible_managed }}
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd