Skip to content

Commit

Permalink
libnetwork/netavark: pass plugin directories to nv
Browse files Browse the repository at this point in the history
Netavark needs to get the actual list of directories from podman because
users can set them in contianers.conf.

Note that this change requires a netavark with
containers/netavark#509

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  • Loading branch information
Luap99 committed Mar 30, 2023
1 parent 56c8edf commit 0d67a5e
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion libnetwork/netavark/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,12 @@ func (n *netavarkNetwork) Teardown(namespacePath string, options types.TeardownO
}

func (n *netavarkNetwork) getCommonNetavarkOptions() []string {
return []string{"--config", n.networkRunDir, "--rootless=" + strconv.FormatBool(n.networkRootless), "--aardvark-binary=" + n.aardvarkBinary}
opts := []string{"--config", n.networkRunDir, "--rootless=" + strconv.FormatBool(n.networkRootless), "--aardvark-binary=" + n.aardvarkBinary}
// Note this will require a netavark with https://github.com/containers/netavark/pull/509
for _, dir := range n.pluginDirs {
opts = append(opts, "--plugin-directory", dir)
}
return opts
}

func (n *netavarkNetwork) convertNetOpts(opts types.NetworkOptions) (*netavarkOptions, error) {
Expand Down

0 comments on commit 0d67a5e

Please sign in to comment.