From 7dd253aa030c1186265e8a0b19fb04cfcdbb67e6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 25 Aug 2017 18:25:42 +0200 Subject: cri-o: change to system runc Newer versions of cri-o do not carry runc but use the one from the system. Signed-off-by: Giuseppe Scrivano --- roles/docker/templates/crio.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/docker') diff --git a/roles/docker/templates/crio.conf.j2 b/roles/docker/templates/crio.conf.j2 index eae1759ab..5b31932b1 100644 --- a/roles/docker/templates/crio.conf.j2 +++ b/roles/docker/templates/crio.conf.j2 @@ -43,7 +43,7 @@ stream_port = "10010" # This is a mandatory setting as this runtime will be the default one # and will also be used for untrusted container workloads if # runtime_untrusted_workload is not set. -runtime = "/usr/libexec/crio/runc" +runtime = "/usr/bin/runc" # runtime_untrusted_workload is the OCI compatible runtime used for untrusted # container workloads. This is an optional setting, except if -- cgit v1.2.3 From f1bb63e076a764732dfcc2da1536591bfdc15cb8 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 25 Aug 2017 18:51:27 +0200 Subject: roles: use openshift_use_crio Signed-off-by: Giuseppe Scrivano --- roles/docker/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/docker') diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 1f9ac5059..78c6671d8 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -7,8 +7,8 @@ - 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) }}" + l_use_crio: "{{ openshift_use_crio | default(False) }}" + l_use_crio_only: "{{ openshift_use_crio_only | default(False) }}" - name: Use Package Docker if Requested include: package_docker.yml -- cgit v1.2.3