diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-04 18:32:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-04 18:32:23 -0400 |
commit | 3db2bb10c0ad5e7ed702bfccdec03562533e8539 (patch) | |
tree | 27e9493d9e5ed24ec1847678b76e02e10d61ce77 /roles/openshift_facts/tasks | |
parent | 145c90c9eb58ae9ce25e7795fcf403a2595d3580 (diff) | |
parent | 31e708a5d440a6ad13f81c4b94ad26e0b2d9587a (diff) | |
download | openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.gz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.bz2 openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.tar.xz openshift-3db2bb10c0ad5e7ed702bfccdec03562533e8539.zip |
Merge pull request #4898 from giuseppe/cri-o
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts/tasks')
-rw-r--r-- | roles/openshift_facts/tasks/main.yml | 2 |
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 |