External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-07 17:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Rename runtime docker_version (#2082)

Browse Source 
Renaming runtime docker_version to prevent setting that
value on the command line from breaking the play run.

This fixes #2081
This commit is contained in:
Evan Zeimet
2017-12-19 08:47:54 -06:00
committed by Matthew Mosesohn
parent b2cb0725ac
commit a6975c1850
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/templates/docker.service.j2
View File

@@ -18,7 +18,7 @@ Environment=GOTRACEBACK=crash
ExecReload=/bin/kill -s HUP $MAINPID
Delegate=yes
KillMode=process
ExecStart={{ docker_bin_dir }}/docker{% if docker_version.stdout|version_compare('17.03', '<') %} daemon{% else %}d{% endif %} \
ExecStart={{ docker_bin_dir }}/docker{% if installed_docker_version.stdout|version_compare('17.03', '<') %} daemon{% else %}d{% endif %} \
$DOCKER_OPTS \
$DOCKER_STORAGE_OPTIONS \
$DOCKER_NETWORK_OPTIONS \