summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-06-13 09:25:29 -0400
committerGitHub <noreply@github.com>2016-06-13 09:25:29 -0400
commitfcb22cdc7827b1733db4535ce153dae200af078e (patch)
treea8848d78a73e08bde00f9a8d34dc45c3b8624923 /roles/docker/tasks
parentfea08b9ba213b69667e103ff9dfd4383218e9eac (diff)
parent666657a4969851a0e08357334ffe60a156024980 (diff)
downloadopenshift-fcb22cdc7827b1733db4535ce153dae200af078e.tar.gz
openshift-fcb22cdc7827b1733db4535ce153dae200af078e.tar.bz2
openshift-fcb22cdc7827b1733db4535ce153dae200af078e.tar.xz
openshift-fcb22cdc7827b1733db4535ce153dae200af078e.zip
Merge pull request #2021 from dgoodwin/comment-docker-1.10
Remove Docker 1.10 requirement temporarily.
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml28
1 files changed, 0 insertions, 28 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 3368e7cd9..1f5f891c7 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,32 +1,4 @@
---
-# Going forward we require Docker 1.10 or greater. If the user has a lesser version installed they must run a separate upgrade process.
-- name: Get current installed Docker version
- command: "{{ repoquery_cmd }} --installed --qf '%{version}' docker"
- when: not openshift.common.is_atomic | bool
- register: curr_docker_version
- changed_when: false
-
-# TODO: The use of upgrading var will be removed in the coming upgrade refactor. This is a temporary
-# fix to wory around the fact that right now, this role is called during upgrade, before we're
-# ready to upgrade Docker.
-- name: Fail if Docker upgrade is required
- fail:
- msg: "Docker {{ curr_docker_version.stdout }} must be upgraded to Docker 1.10 or greater"
- when: not upgrading | bool and not curr_docker_version | skipped and curr_docker_version.stdout | default('0.0', True) | version_compare('1.10', '<')
-
-- name: Get latest available version of Docker
- command: >
- {{ repoquery_cmd }} --qf '%{version}' "docker"
- register: avail_docker_version
- failed_when: false
- changed_when: false
- 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:
- msg: "Docker {{ avail_docker_version.stdout }} is available, but 1.10 or greater is required"
- when: not avail_docker_version | skipped and avail_docker_version.stdout | default('0.0', True) | version_compare('1.10', '<')
-
- stat: path=/etc/sysconfig/docker-storage
register: docker_storage_check