summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:14 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:29:18 -0300
commit0fc4aae17527d8d51b3d3848ccbbf42c6d03fac9 (patch)
tree9fd4f9b8b7e930b0ef2d24e7cd67f0758047e8af
parent717012aa4d5df01e5859ce44705abfbf34be8047 (diff)
downloadopenshift-0fc4aae17527d8d51b3d3848ccbbf42c6d03fac9.tar.gz
openshift-0fc4aae17527d8d51b3d3848ccbbf42c6d03fac9.tar.bz2
openshift-0fc4aae17527d8d51b3d3848ccbbf42c6d03fac9.tar.xz
openshift-0fc4aae17527d8d51b3d3848ccbbf42c6d03fac9.zip
Fix version compare with using just 3.2 or 1.2.
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index 2193b8c02..dc369e883 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -74,7 +74,7 @@
set_fact:
docker_version: "{{ '1.9.1' }}"
when: " l_common_version != '0.0' and
- (( 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' ))"
+ (( 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' ))"
- debug: var=docker_version