summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks/main.yml
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-22 14:50:03 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-22 14:50:03 -0400
commit7cb05911b4214bfb75abf65dd19a55f73fe09982 (patch)
treeabd001fdd81dd708e6eec28336911cf98118aa9f /roles/docker/tasks/main.yml
parent8490fa6b6273b89f6f902888411b8789fda1dda3 (diff)
parent4bbda8feeca1e5f60edf93103549b60daca9c34a (diff)
downloadopenshift-7cb05911b4214bfb75abf65dd19a55f73fe09982.tar.gz
openshift-7cb05911b4214bfb75abf65dd19a55f73fe09982.tar.bz2
openshift-7cb05911b4214bfb75abf65dd19a55f73fe09982.tar.xz
openshift-7cb05911b4214bfb75abf65dd19a55f73fe09982.zip
Merge pull request #1792 from detiber/fix_docker_version_check
Fix for docker not present
Diffstat (limited to 'roles/docker/tasks/main.yml')
-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 878d5fea8..4a47a60fa 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -22,7 +22,7 @@
- name: Install docker
action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version if docker_version is defined and docker_version != '' else '' }} state=present"
- when: not openshift.common.is_atomic | bool and not docker_version_result | skipped and docker_version_result.stdout | default('0.0', True) | version_compare(docker_version, 'lt')
+ when: not openshift.common.is_atomic | bool and docker_downgrade_result | skipped
# If docker were enabled and started before we downgraded it may have entered a
# failed state. Check for that and clear it if necessary.