diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-09 02:08:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 02:08:56 +0100 |
| commit | 6d56ac7e0f5109475f22f112f44935866a581144 (patch) | |
| tree | 91a394c92a215f9b214ffe1d6e7a2ee55b58d25d /cmd | |
| parent | ec37d35883b172c92cb28c60d61947c4eb8ef917 (diff) | |
| parent | 8b7b0b7caf104fbd0c04869296f395b51c5e211e (diff) | |
| download | podman-6d56ac7e0f5109475f22f112f44935866a581144.tar.gz podman-6d56ac7e0f5109475f22f112f44935866a581144.tar.bz2 podman-6d56ac7e0f5109475f22f112f44935866a581144.zip | |
Merge pull request #12222 from Luap99/pod-create-net
pod create: read network mode from config
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 0a0d43b53..b966706b4 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -117,7 +117,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 } @@ -134,7 +134,7 @@ func create(cmd *cobra.Command, args []string) error { } else { // reassign certain options for lbpod api, these need to be populated in spec 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 } |