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

server: respect ocid.network.plugin_dir setting

Browse source 
Previously ocicni did not have support for setting the plugin directory.
Now that it has grown support for it, use it to actually respect the
setting a user has provided for ocid.network.* options.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
This commit is contained in:
Aleksa Sarai 2017-01-25 04:12:51 +11:00
parent b1685800dd
commit d5abfa1ecf
No known key found for this signature in database
GPG key ID: 9E18AA267DDB8DB4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/server.go
View file

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