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
This commit is contained in:
till 2019-01-25 13:09:04 +01:00
parent 6ec0977b17
commit 951b919d30
No known key found for this signature in database
GPG Key ID: B119050E2EBA1DC5
3 changed files with 15 additions and 5 deletions

View File

@ -1,13 +1,19 @@
--- ---
- name: Ensure containerd service dir exists. - name: Ensure service directories exist.
file: file:
path: /etc/systemd/system/containerd.service.d path: /etc/systemd/system/{{ item }}
state: directory 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: template:
src: override.conf.j2 src: "override-{{ item }}.conf.j2"
dest: /etc/systemd/system/containerd.service.d/override.conf dest: /etc/systemd/system/{{ item }}.service.d/override.conf
with_items:
- containerd
- docker
register: override_template register: override_template
- name: Reload systemd daemon if template is changed. - name: Reload systemd daemon if template is changed.

View File

@ -0,0 +1,4 @@
# {{ ansible_managed }}
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd