C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4085 from chadswen/docker-systemd-after-containerd

Browse source 
Fix docker 18.09.1 systemd service
This commit is contained in:
Chad Swenson 2019-01-22 13:33:34 -06:00 committed by GitHub
commit e6f1c4df7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/container-engine/docker/templates/docker.service.j2
View file

@ -2,13 +2,13 @@
Description=Docker Application Container Engine Description=Docker Application Container Engine
Documentation=http://docs.docker.com Documentation=http://docs.docker.com
{% if ansible_os_family == "RedHat" %} {% if ansible_os_family == "RedHat" %}
After=network.target docker-storage-setup.service After=network.target docker-storage-setup.service{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
Wants=docker-storage-setup.service Wants=docker-storage-setup.service
{% elif ansible_os_family == "Debian" %} {% elif ansible_os_family == "Debian" %}
After=network.target docker.socket After=network.target docker.socket{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
Wants=docker.socket Wants=docker.socket
{% elif ansible_os_family == "Suse" %} {% elif ansible_os_family == "Suse" %}
After=network.target After=network.target{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
{% endif %} {% endif %}
[Service] [Service]