Pass check-alive flag to IPAM API

This commit is contained in:
Bryan Boreham committed 2017-05-12 06:56:52 +00:00
1 parent b1917d909a
commit 0273491e6e
4 files changed
+23 -14

No files matched your search

+2 -2
View File
@@ -552,14 +552,14 @@ func (proxy *Proxy) allocateCIDRs(containerID string, cidrs []string) ([]*net.IP
for _, cidr := range cidrs {
switch {
case cidr == "net:default":
ipnet, err = proxy.weave.AllocateIP(containerID)
ipnet, err = proxy.weave.AllocateIP(containerID, true)
case strings.HasPrefix(cidr, "net:"):
var subnet *net.IPNet
_, subnet, err = net.ParseCIDR(strings.TrimPrefix(cidr, "net:"))
if err != nil {
break
}
ipnet, err = proxy.weave.AllocateIPInSubnet(containerID, subnet)
ipnet, err = proxy.weave.AllocateIPInSubnet(containerID, subnet, true)
case strings.HasPrefix(cidr, "ip:"):
ipnet, err = proxy.claimCIDR(containerID, strings.TrimPrefix(cidr, "ip:"))
default: