summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-07-27 10:56:07 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commit8926c30ecb60a95eb5a9611810657d100a4a6b18 (patch)
tree141b5b132702527a546ccade4294f81d616a84ef
parent72eaf22e58299e6584b026afb609266835177175 (diff)
downloadopenshift-8926c30ecb60a95eb5a9611810657d100a4a6b18.tar.gz
openshift-8926c30ecb60a95eb5a9611810657d100a4a6b18.tar.bz2
openshift-8926c30ecb60a95eb5a9611810657d100a4a6b18.tar.xz
openshift-8926c30ecb60a95eb5a9611810657d100a4a6b18.zip
cri-o: skip Docker version test
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/openshift_facts/tasks/main.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 451386bf1..4af02ab96 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -7,6 +7,7 @@
# Locally setup containerized facts for now
- set_fact:
l_is_atomic: "{{ ostree_booted.stat.exists }}"
+ l_use_crio: "{{ openshift_docker_use_crio | default(false) }}"
- set_fact:
l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
l_is_openvswitch_system_container: "{{ (openshift_use_openvswitch_system_container | default(openshift_use_system_containers) | bool) }}"
@@ -55,6 +56,7 @@
- l_atomic_docker_version.stdout | replace('"', '') | version_compare('1.12','>=')
when:
+ - not l_use_crio
- l_is_atomic | bool
- r_openshift_facts_ran is not defined