External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-16 08:27:31 -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

4
roles/docker/tasks/main.yml
View File

@@ -76,7 +76,7 @@
- name: set fact for docker_version
command: "docker version -f '{{ '{{' }}.Client.Version{{ '}}' }}'"
register: docker_version
register: installed_docker_version
changed_when: false
- name: check minimum docker version for docker_dns mode. You need at least docker version >= 1.12 for resolvconf_mode=docker_dns
@@ -85,7 +85,7 @@
when: >
dns_mode != 'none' and
resolvconf_mode == 'docker_dns' and
docker_version.stdout|version_compare('1.12', '<')
installed_docker_version.stdout|version_compare('1.12', '<')
- name: Set docker systemd config
include: systemd.yml