summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-06-08 09:37:19 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-06-08 10:30:00 -0400
commit4bec37c10f835902a42b62493c5df0de97db73f8 (patch)
treebb4bdba349c30c0a3b6c7a1d4a1766174625e86a /roles/docker/tasks
parent12f351d71b13feb4b808b15f6756fbf6a81de587 (diff)
downloadopenshift-4bec37c10f835902a42b62493c5df0de97db73f8.tar.gz
openshift-4bec37c10f835902a42b62493c5df0de97db73f8.tar.bz2
openshift-4bec37c10f835902a42b62493c5df0de97db73f8.tar.xz
openshift-4bec37c10f835902a42b62493c5df0de97db73f8.zip
Bug 1338726 - never abort install if the latest version of docker is already installed
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index f002dbc01..cafbdee4c 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -20,7 +20,7 @@
register: avail_docker_version
failed_when: false
changed_when: false
- when: not openshift.common.is_atomic | bool
+ when: not curr_docker_version.stdout | default('0.0', True) | version_compare('1.10', '>=') and not openshift.common.is_atomic | bool
- name: Verify Docker >= 1.10 is available
fail: