From 072911dad1830244f5323a687c20e7961b9933bf Mon Sep 17 00:00:00 2001
From: Michal Klempa <michal.klempa@gmail.com>
Date: Wed, 20 Feb 2019 15:35:10 +0100
Subject: [PATCH] Revert "Fixes #97, Triggers #98, Makes me sad: Fix Docker
 18.09.0 startup issue on systemd systems."

This reverts commit d8a4438b3c99ea4c8401ad2c06bfb2f6ea7305cf.
---
 tasks/docker-1809-shim.yml | 10 ----------
 tasks/main.yml             |  4 ----
 templates/override.conf.j2 |  2 --
 3 files changed, 16 deletions(-)
 delete mode 100644 tasks/docker-1809-shim.yml
 delete mode 100644 templates/override.conf.j2

diff --git a/tasks/docker-1809-shim.yml b/tasks/docker-1809-shim.yml
deleted file mode 100644
index f59f85a..0000000
--- a/tasks/docker-1809-shim.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- 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 f248279..8444ac7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,10 +11,6 @@
     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
deleted file mode 100644
index 76864e2..0000000
--- a/templates/override.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecStartPre=