summaryrefslogtreecommitdiffstats
path: root/roles/openshift_docker_facts
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-24 09:46:33 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-25 10:28:32 -0300
commit0c7433838c8c6409b8de907fcc946fc73fe90527 (patch)
tree0e0138faf3cb685ac8dd51df79ee25f50c1111b6 /roles/openshift_docker_facts
parent82a70f9cc1522d239212701ab6c9260cbf9dc8a7 (diff)
downloadopenshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.gz
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.bz2
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.xz
openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.zip
Work towards determining openshift_version when unspecified.
openshift_docker role was largely useless now, but also almost did what we needed. (deps ordering still needs to be changed) Remove defaulting of openshift_version.
Diffstat (limited to 'roles/openshift_docker_facts')
-rw-r--r--roles/openshift_docker_facts/defaults/main.yml1
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml4
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_docker_facts/defaults/main.yml b/roles/openshift_docker_facts/defaults/main.yml
index 7baa87ab8..ed97d539c 100644
--- a/roles/openshift_docker_facts/defaults/main.yml
+++ b/roles/openshift_docker_facts/defaults/main.yml
@@ -1,2 +1 @@
---
-openshift_version: "{{ openshift_image_tag | default(openshift.docker.openshift_image_tag | default('')) }}"
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index 43359dcb5..bc3637351 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -57,6 +57,8 @@
l_common_version: "{{ common_version.stdout | default('0.0', True) }}"
when: not openshift.common.is_containerized | bool
+- debug: var=l_common_version
+
- name: Set docker version to be installed
set_fact:
docker_version: "{{ '1.8.2' }}"
@@ -68,3 +70,5 @@
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' )"
+
+- debug: var=docker_version