diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-09 15:54:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 15:54:24 -0400 |
| commit | 6498187103bd951304ce8112b927d430347513e0 (patch) | |
| tree | da011100ff9ed6f868f18b2df5cf19f8014744b0 /roles/openshift_docker_facts | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| parent | e272847e1a195d8ca74103fd87c7207b68c0d919 (diff) | |
| download | openshift-6498187103bd951304ce8112b927d430347513e0.tar.gz openshift-6498187103bd951304ce8112b927d430347513e0.tar.bz2 openshift-6498187103bd951304ce8112b927d430347513e0.tar.xz openshift-6498187103bd951304ce8112b927d430347513e0.zip | |
Merge pull request #2005 from brenton/bz1338726
Bug 1338726 - never abort install if the latest version of docker is already installed
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 43359dcb5..cdea90413 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -57,14 +57,3 @@ l_common_version: "{{ common_version.stdout | default('0.0', True) }}" when: not openshift.common.is_containerized | bool -- name: Set docker version to be installed - set_fact: - docker_version: "{{ '1.8.2' }}" - when: " ( l_common_version | version_compare('3.2','<') and openshift.common.service_type in ['openshift', 'atomic-openshift'] ) or - ( l_common_version | version_compare('1.1.4','<') and openshift.common.service_type == 'origin' )" - -- name: Set docker version to be installed - set_fact: - docker_version: "{{ '1.9.1' }}" - when: " ( l_common_version | version_compare('3.2','>') and openshift.common.service_type == 'atomic-openshift' ) or - ( l_common_version | version_compare('1.2','>') and openshift.common.service_type == 'origin' )" |