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:
parent
43befeae4d
commit
9f5b17cce5
|
|
@ -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...)
|
||||
|
||||
for i, opt := range cmdArgs {
|
||||
|
|
|
|||
Loading…
Reference in New Issue