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

roles: docker: Update docker service for SUSE distributions (#3924)

Browse source 
The containerd service and socket files have been dropped from the
openSUSE docker package so we should not require them in the docker
service anymore. This makes the docker service file look similar to
the one shipped by the openSUSE package.

Signed-off-by: Markos Chandras <mchandras@suse.de>
This commit is contained in:
Markos Chandras 2018-12-27 15:26:02 +00:00 committed by Kubernetes Prow Robot
parent d4bd08f82e
commit d156449819
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,7 @@ Wants=docker-storage-setup.service
After=network.target docker.socket After=network.target docker.socket
Wants=docker.socket Wants=docker.socket
{% elif ansible_os_family == "Suse" %} {% elif ansible_os_family == "Suse" %}
After=network.target containerd.socket containerd.service After=network.target
Requires=containerd.socket containerd.service
{% endif %} {% endif %}
[Service] [Service]
@ -23,7 +22,7 @@ Delegate=yes
KillMode=process KillMode=process
ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is version('17.03', '<') %} daemon{% else %}d{% endif %} \ ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout is version('17.03', '<') %} daemon{% else %}d{% endif %} \
{% if ansible_os_family == "Suse" %} {% if ansible_os_family == "Suse" %}
--containerd /run/containerd/containerd.sock --add-runtime oci=/usr/bin/docker-runc \ --add-runtime oci=/usr/sbin/docker-runc \
{% endif %} {% endif %}
$DOCKER_OPTS \ $DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \ $DOCKER_STORAGE_OPTIONS \