From a6975c18506f533ba9e67c7fb233e9898b77502b Mon Sep 17 00:00:00 2001
From: Evan Zeimet <podnov@gmail.com>
Date: Tue, 19 Dec 2017 08:47:54 -0600
Subject: [PATCH] Rename runtime docker_version (#2082)
Renaming runtime docker_version to prevent setting that
value on the command line from breaking the play run.
This fixes #2081
---
roles/docker/tasks/main.yml | 4 ++--
roles/docker/templates/docker.service.j2 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 4bab1e275..e5ca6d165 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -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
diff --git a/roles/docker/templates/docker.service.j2 b/roles/docker/templates/docker.service.j2
index 7b066ea6d..73c4c7e61 100644
--- a/roles/docker/templates/docker.service.j2
+++ b/roles/docker/templates/docker.service.j2
@@ -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 \
--
GitLab