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

main: Add CNI options

Browse source 
We add 2 ocid options for choosing the CNI configuration and plugin
binaries directories: --cni-config-dir and --cni-plugin-dir.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2016-12-17 12:23:07 +01:00
parent 50a3958e5a
commit c525459000
No known key found for this signature in database
GPG key ID: 8A803CDD4F566C4A
6 changed files with 61 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/server/main.go
View file

@ -66,6 +66,12 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
if ctx.GlobalIsSet("cgroup-manager") {
config.CgroupManager = ctx.GlobalString("cgroup-manager")
}
if ctx.GlobalIsSet("cni-config-dir") {
config.NetworkDir = ctx.GlobalString("cni-config-dir")
}
if ctx.GlobalIsSet("cni-plugin-dir") {
config.PluginDir = ctx.GlobalString("cni-plugin-dir")
}
return nil
}
@ -157,6 +163,14 @@ func main() {
Name: "cgroup-manager",
Usage: "cgroup manager (cgroupfs or systemd)",
},
cli.StringFlag{
Name: "cni-config-dir",
Usage: "CNI configuration files directory",
},
cli.StringFlag{
Name: "cni-plugin-dir",
Usage: "CNI plugin binaries directory",
},
}
// remove once https://github.com/urfave/cli/pull/544 lands