diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-18 11:53:33 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-18 11:53:33 -0400 |
| commit | 9c2fffb769ba17664d5c5fe219c3f899a14aae61 (patch) | |
| tree | c9cd85b12ae9c5e9f54179283625489d432d5901 | |
| parent | 2f4689814d7768a72737bb8bc699d493a2f5b5d6 (diff) | |
| parent | 9a3c91e3cce912a13563b417d9a4206d998c51fe (diff) | |
| download | openshift-9c2fffb769ba17664d5c5fe219c3f899a14aae61.tar.gz openshift-9c2fffb769ba17664d5c5fe219c3f899a14aae61.tar.bz2 openshift-9c2fffb769ba17664d5c5fe219c3f899a14aae61.tar.xz openshift-9c2fffb769ba17664d5c5fe219c3f899a14aae61.zip | |
Merge pull request #1762 from brenton/docker1
Bug 1320829 - Handle OSE 3.0 installs
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 075dbc145..89393168b 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -59,7 +59,7 @@ - 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 == 'atomic-openshift' ) or + 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 |