toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17316 from rmb938/ipam_conf_options

Browse Source 
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
This commit is contained in:
Tibor Vass
2016-01-14 16:30:03 -05:00
parent 390716081e f8714c52f0
commit 57bedb0b2d
8 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/network.go
+1 -1
View File
@@ -114,7 +114,7 @@ func (daemon *Daemon) CreateNetwork(name, driver string, ipam network.IPAM, opti
return nil, err
}
nwOptions = append(nwOptions, libnetwork.NetworkOptionIpam(ipam.Driver, "", v4Conf, v6Conf, nil))
nwOptions = append(nwOptions, libnetwork.NetworkOptionIpam(ipam.Driver, "", v4Conf, v6Conf, ipam.Options))
nwOptions = append(nwOptions, libnetwork.NetworkOptionDriverOpts(options))
if internal {
nwOptions = append(nwOptions, libnetwork.NetworkOptionInternalNetwork())