summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-24 11:13:33 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:32 -0300
commit436c287335c3b578aaa2c1c8835583feaee2a3cf (patch)
tree44afc60d54c855cdf32c1c84553a6a2435b6d399 /roles
parent0c7433838c8c6409b8de907fcc946fc73fe90527 (diff)
downloadopenshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.gz
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.bz2
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.tar.xz
openshift-436c287335c3b578aaa2c1c8835583feaee2a3cf.zip
Stop downgrading Docker because we don't know what version to install yet.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml14
1 files changed, 10 insertions, 4 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index bc3637351..2193b8c02 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -49,6 +49,8 @@
changed_when: false
when: not openshift.common.is_containerized | bool
+- debug: var=openshift_version
+
- set_fact:
l_common_version: "{{ openshift_version | default('0.0', True) | oo_image_tag_to_rpm_version }}"
when: openshift.common.is_containerized | bool
@@ -59,16 +61,20 @@
- debug: var=l_common_version
+# TODO: hardcoding specific docker versions here is not going to be maintainable...
+# Don't define a docker version if we don't yet know what version we're going to install.
- 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' )"
+ when: " l_common_version != '0.0' and
+ (( 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' )"
+ 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' ))"
- debug: var=docker_version