From d5abfa1ecff3a4dd0943038b38d3b009034adcfb Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 25 Jan 2017 04:12:51 +1100 Subject: [PATCH] server: respect ocid.network.plugin_dir setting 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 --- server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index 4df2089b..5e1edd2b 100644 --- a/server/server.go +++ b/server/server.go @@ -476,7 +476,7 @@ func New(config *Config) (*Server, error) { } sandboxes := make(map[string]*sandbox) containers := oci.NewMemoryStore() - netPlugin, err := ocicni.InitCNI(config.NetworkDir) + netPlugin, err := ocicni.InitCNI(config.NetworkDir, config.PluginDir) if err != nil { return nil, err }