vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add configuration for specifying cgroup manager

Browse source 
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
This commit is contained in:
Mrunal Patel 2016-12-19 15:01:27 -08:00
parent a7190853b6
commit edad8f866d
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/server/main.go
View file

@ -63,6 +63,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
if ctx.GlobalIsSet("apparmor-profile") {
config.ApparmorProfile = ctx.GlobalString("apparmor-profile")
}
if ctx.GlobalIsSet("cgroup-manager") {
config.CgroupManager = ctx.GlobalString("cgroup-manager")
}
return nil
}
@ -150,6 +153,10 @@ func main() {
Name: "selinux",
Usage: "enable selinux support",
},
cli.StringFlag{
Name: "cgroup-manager",
Usage: "cgroup manager (cgroupfs or systemd)",
},
}
// remove once https://github.com/urfave/cli/pull/544 lands