summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-09 11:23:17 -0700
committerGitHub <noreply@github.com>2017-10-09 11:23:17 -0700
commitf8d96e8f6639c09cf7847d67411fd71ece1624b7 (patch)
tree5e3e36149304a870e05c7c82e15adaa0b06edd5d
parent3038a601d1d51fdc9f1698d03a54ecac68251c88 (diff)
parent73aaf6cb2c6d7dcd2c46d62662390ec1d781f9f2 (diff)
downloadopenshift-f8d96e8f6639c09cf7847d67411fd71ece1624b7.tar.gz
openshift-f8d96e8f6639c09cf7847d67411fd71ece1624b7.tar.bz2
openshift-f8d96e8f6639c09cf7847d67411fd71ece1624b7.tar.xz
openshift-f8d96e8f6639c09cf7847d67411fd71ece1624b7.zip
Merge pull request #5699 from giuseppe/crio-use-systemd
Automatic merge from submit-queue. crio: use systemd manager fix a regression introduced last week. 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 cce790a60..b715c2ffa 100644
--- a/roles/docker/templates/crio.conf.j2
+++ b/roles/docker/templates/crio.conf.j2
@@ -98,7 +98,7 @@ apparmor_profile = "crio-default"
# cgroup_manager is the cgroup management implementation to be used
# for the runtime.
-cgroup_manager = "cgroupfs"
+cgroup_manager = "systemd"
# hooks_dir_path is the oci hooks directory for automatically executed hooks
hooks_dir_path = "/usr/share/containers/oci/hooks.d"