summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-08-25 18:25:42 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-25 18:25:44 +0200
commit7dd253aa030c1186265e8a0b19fb04cfcdbb67e6 (patch)
tree7c01b09857dcd93530bf51620b78012c4de07e60
parent521b65b2a3c911c926974bd70309434d97e6fd0d (diff)
downloadopenshift-7dd253aa030c1186265e8a0b19fb04cfcdbb67e6.tar.gz
openshift-7dd253aa030c1186265e8a0b19fb04cfcdbb67e6.tar.bz2
openshift-7dd253aa030c1186265e8a0b19fb04cfcdbb67e6.tar.xz
openshift-7dd253aa030c1186265e8a0b19fb04cfcdbb67e6.zip
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 <gscrivan@redhat.com>
-rw-r--r--roles/docker/templates/crio.conf.j22
1 files changed, 1 insertions, 1 deletions
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