Merge pull request #23944 from tonistiigi/disable-iptables

Disable iptables in swarm test daemons
Upstream-commit: d4bff5e3aa014f7062f1d7a6c929336e2a88faff
Component: engine
This commit is contained in:
Brian Goff
2016-06-25 20:22:59 -04:00
committed by GitHub
@@ -208,7 +208,7 @@ func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *Swarm
port: defaultSwarmPort + s.portIndex,
}
d.listenAddr = fmt.Sprintf("0.0.0.0:%d", d.port)
err := d.StartWithBusybox()
err := d.StartWithBusybox("--iptables=false") // avoid networking conflicts
c.Assert(err, check.IsNil)
if joinSwarm == true {