diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-11 15:52:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-11 15:52:42 +0100 |
| commit | fd010adfdcb6f578623b77281f2ae012bcd1ac85 (patch) | |
| tree | dfb7681ce86eed1dbef58f3d024650550d15c4a0 /cmd | |
| parent | 8de9950038b5a0582bfecfbe3a11427e6cfbfcfe (diff) | |
| parent | 9c94530bbe575544d3dceeb591bc3c836a367e22 (diff) | |
| download | podman-fd010adfdcb6f578623b77281f2ae012bcd1ac85.tar.gz podman-fd010adfdcb6f578623b77281f2ae012bcd1ac85.tar.bz2 podman-fd010adfdcb6f578623b77281f2ae012bcd1ac85.zip | |
Merge pull request #12269 from Luap99/backport3.4
[v3.4] backport networking fixes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/pods/create.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index b3f84dcd8..58bb799a3 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -116,7 +116,7 @@ func create(cmd *cobra.Command, args []string) error { return fmt.Errorf("cannot specify no-hosts without an infra container") } flags := cmd.Flags() - createOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, false) + createOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, createOptions.Infra) if err != nil { return err } @@ -139,7 +139,7 @@ func create(cmd *cobra.Command, args []string) error { createOptions.CpusetCpus = infraOptions.CPUSetCPUs createOptions.Pid = infraOptions.PID flags := cmd.Flags() - infraOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, false) + infraOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, createOptions.Infra) if err != nil { return err } |