diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-12 10:14:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 10:14:44 -0500 |
| commit | 3783c3fe21e00a6854c968f7e0c03e611acaa0fa (patch) | |
| tree | c05cc1f83e4af69457b5b1fc7c0c17d97bbaacca /libpod/networking.go | |
| parent | 378bed4869dccc4a886a8888aa5cd7dc13cdaee2 (diff) | |
| parent | 240e5789d409d82453b72f87862f7e71efa381e4 (diff) | |
| download | podman-3783c3fe21e00a6854c968f7e0c03e611acaa0fa.tar.gz podman-3783c3fe21e00a6854c968f7e0c03e611acaa0fa.tar.bz2 podman-3783c3fe21e00a6854c968f7e0c03e611acaa0fa.zip | |
Merge pull request #215 from mheon/update_cni
Update OCICNI vendor and plugin directories
Diffstat (limited to 'libpod/networking.go')
| -rw-r--r-- | libpod/networking.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/networking.go b/libpod/networking.go index 456830708..41bd65d25 100644 --- a/libpod/networking.go +++ b/libpod/networking.go @@ -38,7 +38,8 @@ func (r *Runtime) createNetNS(ctr *Container) (err error) { podNetwork := getPodNetwork(ctr.ID(), ctr.Name(), ctrNS.Path(), ctr.config.PortMappings) - if err := r.netPlugin.SetUpPod(podNetwork); err != nil { + _, err = r.netPlugin.SetUpPod(podNetwork) + if err != nil { return errors.Wrapf(err, "error configuring network namespace for container %s", ctr.ID()) } |