diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-29 04:26:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 04:26:30 -0700 |
| commit | 6ab27c6355a4df228ed6d527162d5251d867b9b3 (patch) | |
| tree | 98aff18fca2369cd87219aef0d18db872a67047d /libpod/options.go | |
| parent | fdf979a7917a497322b23354778bd32bbd9b05f5 (diff) | |
| parent | e25924f31c8e9e53490f02073ba69d41e3470712 (diff) | |
| download | podman-6ab27c6355a4df228ed6d527162d5251d867b9b3.tar.gz podman-6ab27c6355a4df228ed6d527162d5251d867b9b3.tar.bz2 podman-6ab27c6355a4df228ed6d527162d5251d867b9b3.zip | |
Merge pull request #2796 from mheon/fix_cni_multinetwork
Ensure that we make a netns for CNI non-default nets
Diffstat (limited to 'libpod/options.go')
| -rw-r--r-- | libpod/options.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/options.go b/libpod/options.go index e1ffd6ea5..84c541314 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -930,7 +930,7 @@ func WithNetNS(portMappings []ocicni.PortMapping, postConfigureNetNS bool, netmo ctr.config.PostConfigureNetNS = postConfigureNetNS ctr.config.NetMode = namespaces.NetworkMode(netmode) - ctr.config.CreateNetNS = !ctr.config.NetMode.IsUserDefined() + ctr.config.CreateNetNS = true ctr.config.PortMappings = portMappings ctr.config.Networks = networks |