Enable per pod cgroups, fix defaulting of cgroup-root when not specified

This commit is contained in:
Derek Carr
2017-02-20 12:05:06 -05:00
parent 7fe105ebc7
commit 43ae6f49ad
7 changed files with 12 additions and 21 deletions

View File

@@ -220,6 +220,7 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
if !cgroupManager.Exists(CgroupName(nodeConfig.CgroupRoot)) {
return nil, fmt.Errorf("invalid configuration: cgroup-root doesn't exist: %v", err)
}
glog.Infof("container manager verified cgroup-root exists: %v", nodeConfig.CgroupRoot)
}
return &containerManagerImpl{
cadvisorInterface: cadvisorInterface,