From 0898ff62d1b17c5102d394bf5fbf7ca54b266b75 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 28 Jul 2017 12:10:18 +0200 Subject: docker: skip Docker setup when using CRI-O Signed-off-by: Giuseppe Scrivano --- roles/docker/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roles/docker') diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 5f9e4cf8a..aecb289d5 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -11,7 +11,9 @@ - name: Use Package Docker if Requested include: package_docker.yml - when: not l_use_system_container + when: + - not l_use_system_container + - not l_use_crio - name: Use System Container Docker if Requested include: systemcontainer_docker.yml -- cgit v1.2.1