summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-07-18 16:48:22 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commitd27fe5a5513649d34c7f208975b2ada5ea459d9b (patch)
tree0baa21f9d6c2a81c2fe0ad91ffe4b7256443541b /roles/docker/tasks
parent0622da00a835fb431654cf997adc08e87b563efa (diff)
downloadopenshift-d27fe5a5513649d34c7f208975b2ada5ea459d9b.tar.gz
openshift-d27fe5a5513649d34c7f208975b2ada5ea459d9b.tar.bz2
openshift-d27fe5a5513649d34c7f208975b2ada5ea459d9b.tar.xz
openshift-d27fe5a5513649d34c7f208975b2ada5ea459d9b.zip
cri-o: Minor fixes for tasks
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 61230fa3d..5f9e4cf8a 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -7,7 +7,7 @@
- set_fact:
l_use_system_container: "{{ openshift.docker.use_system_container | default(False) }}"
- l_use_crio: "{{ use_crio | default(False) }}"
+ l_use_crio: "{{ openshift.docker.use_crio | default(False) }}"
- name: Use Package Docker if Requested
include: package_docker.yml
@@ -22,5 +22,4 @@
- name: Add CRI-O usage Requested
include: systemcontainer_crio.yml
when:
- - l_use_system_container
- l_use_crio