summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-07-28 18:37:58 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commitf0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68 (patch)
tree3b6ea55d94571421c58eb8fc1e24f8c44f7680aa
parent0898ff62d1b17c5102d394bf5fbf7ca54b266b75 (diff)
downloadopenshift-f0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68.tar.gz
openshift-f0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68.tar.bz2
openshift-f0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68.tar.xz
openshift-f0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68.zip
docker: introduce use_crio_only
Introduce a new variable that disable the installation of Docker. For the time being we will still need Docker for building images, so by default leave it installed. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/docker/tasks/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index aecb289d5..1f9ac5059 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -8,18 +8,19 @@
- set_fact:
l_use_system_container: "{{ openshift.docker.use_system_container | default(False) }}"
l_use_crio: "{{ openshift.docker.use_crio | default(False) }}"
+ l_use_crio_only: "{{ openshift.docker.use_crio_only | default(False) }}"
- name: Use Package Docker if Requested
include: package_docker.yml
when:
- not l_use_system_container
- - not l_use_crio
+ - not l_use_crio_only
- name: Use System Container Docker if Requested
include: systemcontainer_docker.yml
when:
- l_use_system_container
- - not l_use_crio
+ - not l_use_crio_only
- name: Add CRI-O usage Requested
include: systemcontainer_crio.yml