From e781e4cb8be85e201ad6e20ddd70401318846323 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 14 Jul 2017 10:37:48 -0400 Subject: cri-o: Allow cri-o usage. This change reuses the docker role to inject cri-o usage. --- roles/docker/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'roles/docker/tasks/main.yml') diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 0c2b16acf..fab1ac57a 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -7,6 +7,7 @@ - set_fact: l_use_system_container: "{{ openshift.docker.use_system_container | default(False) }}" + l_use_crio: "{{ openshift.docker.use_crio | default(False) }}" - name: Use Package Docker if Requested include: package_docker.yml @@ -15,3 +16,7 @@ - name: Use System Container Docker if Requested include: systemcontainer_docker.yml when: l_use_system_container + +- name: Add CRI-O usage Requested + include: systemcontainer_crio.yml + when: l_use_crio -- cgit v1.2.3 From ba71fba1dc64a05b9cc26b72263255a915601c84 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sun, 16 Jul 2017 00:25:26 +0200 Subject: cri-o: configure storage and insecure registries Signed-off-by: Giuseppe Scrivano --- roles/docker/tasks/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'roles/docker/tasks/main.yml') diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index fab1ac57a..61230fa3d 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: "{{ openshift.docker.use_crio | default(False) }}" + l_use_crio: "{{ use_crio | default(False) }}" - name: Use Package Docker if Requested include: package_docker.yml @@ -15,8 +15,12 @@ - name: Use System Container Docker if Requested include: systemcontainer_docker.yml - when: l_use_system_container + when: + - l_use_system_container + - not l_use_crio - name: Add CRI-O usage Requested include: systemcontainer_crio.yml - when: l_use_crio + when: + - l_use_system_container + - l_use_crio -- cgit v1.2.3 From d27fe5a5513649d34c7f208975b2ada5ea459d9b Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Tue, 18 Jul 2017 16:48:22 -0400 Subject: cri-o: Minor fixes for tasks --- roles/docker/tasks/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/docker/tasks/main.yml') 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 -- cgit v1.2.3 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/tasks/main.yml') 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.3 From f0a0e8466a917f0bf40c8b7f3076a1e8a2c8ed68 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 28 Jul 2017 18:37:58 +0200 Subject: 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 --- roles/docker/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'roles/docker/tasks/main.yml') 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 -- cgit v1.2.3