From d8a4438b3c99ea4c8401ad2c06bfb2f6ea7305cf Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 12 Nov 2018 21:14:20 -0600
Subject: [PATCH] Fixes #97, Triggers #98, Makes me sad: Fix Docker 18.09.0
 startup issue on systemd systems.

---
 tasks/docker-1809-shim.yml | 10 ++++++++++
 tasks/main.yml             |  4 ++++
 templates/override.conf.j2 |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 tasks/docker-1809-shim.yml
 create mode 100644 templates/override.conf.j2

diff --git a/tasks/docker-1809-shim.yml b/tasks/docker-1809-shim.yml
new file mode 100644
index 0000000..f59f85a
--- /dev/null
+++ b/tasks/docker-1809-shim.yml
@@ -0,0 +1,10 @@
+---
+- name: Ensure containerd service dir exists.
+  file:
+    path: /etc/systemd/system/containerd.service.d
+    state: directory
+
+- name: Add shim to ensure Docker can start in all environments.
+  template:
+    src: override.conf.j2
+    dest: /etc/systemd/system/containerd.service.d/override.conf
diff --git a/tasks/main.yml b/tasks/main.yml
index 8444ac7..f248279 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,6 +11,10 @@
     state: "{{ docker_package_state }}"
   notify: restart docker
 
+# TODO: Remove this shim once 18.09.1 or later is released.
+- import_tasks: docker-1809-shim.yml
+  when: ansible_service_mgr == 'systemd'
+
 - name: Ensure Docker is started and enabled at boot.
   service:
     name: docker
diff --git a/templates/override.conf.j2 b/templates/override.conf.j2
new file mode 100644
index 0000000..76864e2
--- /dev/null
+++ b/templates/override.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPre=