From 9a3c91e3cce912a13563b417d9a4206d998c51fe Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Mon, 18 Apr 2016 09:43:02 -0400
Subject: Bug 1320829 - Handle OSE 3.0 installs
---
roles/openshift_docker_facts/tasks/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles')
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
--
cgit v1.2.3