diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-07-28 12:10:18 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-03 17:20:52 +0200 |
| commit | 0898ff62d1b17c5102d394bf5fbf7ca54b266b75 (patch) | |
| tree | a10ef76fbdb0fc8163ba6da28ed84eb93d008b67 /roles/docker/tasks | |
| parent | 0a020bae8b93a53271c940714c8701d5e63db5f0 (diff) | |
| download | openshift-0898ff62d1b17c5102d394bf5fbf7ca54b266b75.tar.gz openshift-0898ff62d1b17c5102d394bf5fbf7ca54b266b75.tar.bz2 openshift-0898ff62d1b17c5102d394bf5fbf7ca54b266b75.tar.xz openshift-0898ff62d1b17c5102d394bf5fbf7ca54b266b75.zip | |
docker: skip Docker setup when using CRI-O
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 4 |
1 files changed, 3 insertions, 1 deletions
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 |