diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-06 11:58:13 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-06 11:58:13 -0400 |
| commit | 3021093b746512809b47c2c9190e896cd21d3bd4 (patch) | |
| tree | daeabd1204c1bed7abf9a1adfdf5d6f39368e650 /roles/openshift_docker_facts | |
| parent | b5f6e62bc1c16d8dbc241c64edd198b480492947 (diff) | |
| parent | 2211c07ca6bc74ba2eebf0d4dea7ca3948384d1a (diff) | |
| download | openshift-3021093b746512809b47c2c9190e896cd21d3bd4.tar.gz openshift-3021093b746512809b47c2c9190e896cd21d3bd4.tar.bz2 openshift-3021093b746512809b47c2c9190e896cd21d3bd4.tar.xz openshift-3021093b746512809b47c2c9190e896cd21d3bd4.zip | |
Merge pull request #1717 from sdodson/origin-docker-funtimes
Docker 1.9 is actually cool starting in origin 1.1.4
Diffstat (limited to 'roles/openshift_docker_facts')
| -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 1848619e0..eb762e33f 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -52,4 +52,4 @@ set_fact: docker_version: "{{ '1.8.2' }}" when: " ( common_version.stdout | default('0.0', True) | version_compare('3.2','<') and openshift.common.service_type == 'atomic-openshift' ) or - ( common_version.stdout | default('0.0', True) | version_compare('1.2','<') and openshift.common.service_type == 'origin' )" + ( common_version.stdout | default('0.0', True) | version_compare('1.1.4','<') and openshift.common.service_type == 'origin' )" |