diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-06-07 13:51:44 -0400 |
| commit | 12f351d71b13feb4b808b15f6756fbf6a81de587 (patch) | |
| tree | 8cd3ea02fb98cae19a6288b02abc508b728c8fc0 /roles/openshift_docker_facts | |
| parent | 377405b67551ef51ce6f644bde018986465a1e0c (diff) | |
| parent | c45c5935df97bb4aa9e8e9067d868371b04a24bf (diff) | |
| download | openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.gz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.bz2 openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.xz openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.zip | |
Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansible
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' )" |