From 53a4355e6072ab1e4497793a09e6d790a2e7c577 Mon Sep 17 00:00:00 2001
From: Spencer Smith <robertspencersmith@gmail.com>
Date: Mon, 11 Dec 2017 16:57:26 -0500
Subject: [PATCH] set docker_version fact regardless of docker_dns in use
---
roles/docker/tasks/main.yml | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index d2fdb8125..4bab1e275 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -71,12 +71,21 @@
notify: restart docker
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0)
-- name: check minimum docker version for docker_dns mode. You need at least docker version >= 1.12 for resolvconf_mode=docker_dns
+- name: flush handlers so we can wait for docker to come up
+ meta: flush_handlers
+
+- name: set fact for docker_version
command: "docker version -f '{{ '{{' }}.Client.Version{{ '}}' }}'"
register: docker_version
- failed_when: docker_version.stdout|version_compare('1.12', '<')
changed_when: false
- when: dns_mode != 'none' and resolvconf_mode == 'docker_dns'
+
+- name: check minimum docker version for docker_dns mode. You need at least docker version >= 1.12 for resolvconf_mode=docker_dns
+ fail:
+ msg: "You need at least docker version >= 1.12 for resolvconf_mode=docker_dns"
+ when: >
+ dns_mode != 'none' and
+ resolvconf_mode == 'docker_dns' and
+ docker_version.stdout|version_compare('1.12', '<')
- name: Set docker systemd config
include: systemd.yml
--
GitLab