diff --git a/tasks/docker-1809-shim.yml b/tasks/docker-1809-shim.yml deleted file mode 100644 index 286254b..0000000 --- a/tasks/docker-1809-shim.yml +++ /dev/null @@ -1,16 +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 - register: override_template - -- name: Reload systemd daemon if template is changed. - systemd: - daemon_reload: true - when: override_template is changed diff --git a/tasks/main.yml b/tasks/main.yml index 8968c77..56449ef 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 adab53c..0000000 --- a/templates/override.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# {{ ansible_managed }} -[Service] -ExecStartPre=