summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2020-05-01 09:14:27 -0500
committerbaude <bbaude@redhat.com>2020-05-01 09:20:52 -0500
commit98e71583a4e7a0bf1f4a00fcab8bafa4915eb14a (patch)
treeb7caa4844678401b3947878ad0800d870dd1fcf4 /cmd/podman
parente88a418528173c1bccc9bea6a9eaf3b389d57e47 (diff)
downloadpodman-98e71583a4e7a0bf1f4a00fcab8bafa4915eb14a.tar.gz
podman-98e71583a4e7a0bf1f4a00fcab8bafa4915eb14a.tar.bz2
podman-98e71583a4e7a0bf1f4a00fcab8bafa4915eb14a.zip
add provided cni networks to spec gen
enable final integration tests for networking. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/common/specgen.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 96cd630a3..07936dfed 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -400,6 +400,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
}
s.ShmSize = &shmSize
}
+ s.CNINetworks = c.Net.CNINetworks
s.HostAdd = c.Net.AddHosts
s.UseImageResolvConf = c.Net.UseImageResolvConf
s.DNSServers = c.Net.DNSServers