From cb22c41907b55eeab66501d9b6596c477f9c68ef Mon Sep 17 00:00:00 2001
From: Dawn Chen <dawnchen@google.com>
Date: Wed, 10 Aug 2016 17:47:11 -0700
Subject: [PATCH] Fixed misconfigured kubelet on containervm image for
 node-e2e.

---
 test/e2e_node/e2e_service.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go
index 488a31ebdf9..3ac292a1a5b 100644
--- a/test/e2e_node/e2e_service.go
+++ b/test/e2e_node/e2e_service.go
@@ -252,6 +252,8 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
 		cmdArgs = append(cmdArgs,
 			"--runtime-cgroups=/docker-daemon",
 			"--kubelet-cgroups=/kubelet",
+			"--cgroup-root=/",
+			"--system-cgroups=/system",
 		)
 	}
 	cmdArgs = append(cmdArgs,
@@ -272,7 +274,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
 	if es.cgroupsPerQOS {
 		cmdArgs = append(cmdArgs,
 			"--cgroups-per-qos", "true",
-			"--cgroup-root", "/",
 		)
 	}
 	if !*disableKubenet {