containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libnetwork/pasta: use options from containers.conf 

Read pasta_options from containers.conf and set the arguments based on
that. The options that were set on the cli will appended after that so
it allows some form of overwrites.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2023-06-14 15:39:56 +02:00
parent 43befeae4d
commit 9f5b17cce5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/libnetwork/pasta/pasta.go
View File

@ -83,6 +83,9 @@ func Setup(opts *SetupOptions) error {
} }
} }
// first append options set in the config
cmdArgs = append(cmdArgs, opts.Config.Network.PastaOptions...)
// then append the ones that were set on the cli
cmdArgs = append(cmdArgs, opts.ExtraOptions...) cmdArgs = append(cmdArgs, opts.ExtraOptions...)
for i, opt := range cmdArgs { for i, opt := range cmdArgs {