kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1162 from aboch/fx2

Browse source 
Do not perform the overlap check on user chosen pool
This commit is contained in:
Madhu Venugopal 2016-05-12 10:23:30 -07:00
commit 0de68331ab
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
}