summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-13 11:21:11 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-13 11:21:11 -0300
commit3e850ad3a64c81031d928a18b7cef0bc7c3cd184 (patch)
tree47c6d57b41ff977148c2f97fffe69250f8572368 /roles/docker
parent83ec4f5469b8a64d834bb3f57447c34433302fe3 (diff)
parentfcb22cdc7827b1733db4535ce153dae200af078e (diff)
downloadopenshift-3e850ad3a64c81031d928a18b7cef0bc7c3cd184.tar.gz
openshift-3e850ad3a64c81031d928a18b7cef0bc7c3cd184.tar.bz2
openshift-3e850ad3a64c81031d928a18b7cef0bc7c3cd184.tar.xz
openshift-3e850ad3a64c81031d928a18b7cef0bc7c3cd184.zip
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/docker')
-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