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

Preserve default ipam driver setting

Browse source 
- If IPAMConf does not contain an ipam driver setting

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-10-09 13:57:49 -07:00
parent 0e04c8555e
commit af95bfd273
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/network.go
View file

@ -495,7 +495,9 @@ func NetworkOptionPersist(persist bool) NetworkOption {
// NetworkOptionIpam function returns an option setter for the ipam configuration for this network // NetworkOptionIpam function returns an option setter for the ipam configuration for this network
func NetworkOptionIpam(ipamDriver string, addrSpace string, ipV4 []*IpamConf, ipV6 []*IpamConf) NetworkOption { func NetworkOptionIpam(ipamDriver string, addrSpace string, ipV4 []*IpamConf, ipV6 []*IpamConf) NetworkOption {
return func(n *network) { return func(n *network) {
if ipamDriver != "" {
n.ipamType = ipamDriver n.ipamType = ipamDriver
}
n.addrSpace = addrSpace n.addrSpace = addrSpace
n.ipamV4Config = ipV4 n.ipamV4Config = ipV4
n.ipamV6Config = ipV6 n.ipamV6Config = ipV6