From 656be14e84e52d47316c1daefa54fb4f96ff25c0 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Wed, 20 May 2015 10:58:25 -0700 Subject: [PATCH] Run Docker containers as top-level containers in Debian. Part of #8215 --- cluster/saltbase/salt/kubelet/default | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index ccb23b9a0fd..e34369ea1bc 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -58,4 +58,10 @@ {% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%} {% endif -%} -DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{hostname_override}} {{cloud_provider}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{configure_cbr0}}" +# Run containers under the root cgroup. +{% set cgroup_root = "" -%} +{% if grains['os_family'] == 'Debian' -%} + {% set cgroup_root = "--cgroup_root=/" -%} +{% endif -%} + +DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{hostname_override}} {{cloud_provider}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{configure_cbr0}} {{cgroup_root}}"