0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not perform the overlap check on user chosen pool

Browse source 
- As it was before

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-05-09 14:54:16 -07:00
parent 3ec7568121
commit 8c2a2ff471
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libnetwork/network.go
View file

@ -1123,10 +1123,9 @@ func (n *network) requestPoolHelper(ipam ipamapi.Ipam, addressSpace, preferredPo
return "", nil, nil, err
}
// If the network belongs to global scope or the pool
// returned is invalid, no need to perform overlap
// check.
if n.Scope() == datastore.GlobalScope || !types.IsIPNetValid(pool) {
// If the network belongs to global scope or the pool was
// explicitely chosen or it is invalid, do not perform the overlap check.
if n.Scope() == datastore.GlobalScope || preferredPool != "" || !types.IsIPNetValid(pool) {
return poolID, pool, meta, nil
}