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

2
server/server.go
View file

@ -310,7 +310,7 @@ func New(config *Config) (*Server, error) {
}
sandboxes := make(map[string]*sandbox)
containers := oci.NewMemoryStore()
netPlugin, err := ocicni.InitCNI("")
netPlugin, err := ocicni.InitCNI(config.NetworkDir)
if err != nil {
return nil, err
}