summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 10:40:09 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 10:40:09 -0500
commitfd7f7746dd14e8dd2b73663b2dd833ce1e44a813 (patch)
treefd18513334ab0e6329cd1fbacda98bbc4fffce35 /playbooks/common
parentc9301aa9682846a35dac6948cc0efb5d4628a3ad (diff)
downloadopenshift-fd7f7746dd14e8dd2b73663b2dd833ce1e44a813.tar.gz
openshift-fd7f7746dd14e8dd2b73663b2dd833ce1e44a813.tar.bz2
openshift-fd7f7746dd14e8dd2b73663b2dd833ce1e44a813.tar.xz
openshift-fd7f7746dd14e8dd2b73663b2dd833ce1e44a813.zip
We require docker 1.9 for the 3.2 upgrade
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index c9afca559..68cbf35c0 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -141,8 +141,7 @@
- fail:
msg: This playbook requires access to Docker 1.9 or later
- when: not openshift.common.is_atomic | bool
- and (g_docker_version.avail_version | default(g_docker_version.curr_version, true) | version_compare('1.9','<'))
+ when: g_docker_version.avail_version | default(g_docker_version.curr_version, true) | version_compare('1.9','<')
# TODO: add check to upgrade ostree to get latest Docker