Browse Source

Merge pull request #1577 from brenton/docker19

We require docker 1.9 for the 3.2 upgrade
Brenton Leanhardt 9 years ago
parent
commit
8429188ee2
1 changed files with 1 additions and 2 deletions
  1. 1 2
      playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml

+ 1 - 2
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