diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 14:48:46 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-05 14:48:46 -0400 |
| commit | 8429188ee24688eebf860a1872f8c6a0becee614 (patch) | |
| tree | 1fbb6657e321fe34f02948cef2f2ca0c9d57e997 /playbooks/common/openshift-cluster | |
| parent | 20365026351eff3a68ce78374ad7afbd447952ab (diff) | |
| parent | fd7f7746dd14e8dd2b73663b2dd833ce1e44a813 (diff) | |
| download | openshift-8429188ee24688eebf860a1872f8c6a0becee614.tar.gz openshift-8429188ee24688eebf860a1872f8c6a0becee614.tar.bz2 openshift-8429188ee24688eebf860a1872f8c6a0becee614.tar.xz openshift-8429188ee24688eebf860a1872f8c6a0becee614.zip | |
Merge pull request #1577 from brenton/docker19
We require docker 1.9 for the 3.2 upgrade
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 3 |
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 6804de992..abc0d81c7 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 @@ -204,8 +204,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 |