External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 09:38:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix conntrack for opensuse and docker support (#5880)

Browse Source
This commit is contained in:
Maxime Guyot
2020-04-08 16:37:44 +02:00
committed by GitHub
parent f055ba7965
commit 7eaa7c957a
12 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,9 @@ After=network.target docker.socket{{ ' containerd.service' if installed_docker_v
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
Wants=docker.socket
{% elif ansible_os_family == "Suse" %}
After=network.target{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
{{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
After=network.target lvm2-monitor.service SuSEfirewall2.service
# After=network.target{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
# {{ 'BindsTo=containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') }}
{% endif %}
[Service]