mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2024-11-18 19:10:43 +01:00
Fixes #180: Remove systemd 18.09.0 compatibility shim.
This commit is contained in:
parent
0be83cb480
commit
c59e9df561
@ -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
|
|
@ -11,10 +11,6 @@
|
|||||||
state: "{{ docker_package_state }}"
|
state: "{{ docker_package_state }}"
|
||||||
notify: restart docker
|
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.
|
- name: Ensure Docker is started and enabled at boot.
|
||||||
service:
|
service:
|
||||||
name: docker
|
name: docker
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
# {{ ansible_managed }}
|
|
||||||
[Service]
|
|
||||||
ExecStartPre=
|
|
Loading…
Reference in New Issue
Block a user