From af95bfd2737220883ebad4619728f4f89db28bd7 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Fri, 9 Oct 2015 13:57:49 -0700 Subject: [PATCH] Preserve default ipam driver setting - If IPAMConf does not contain an ipam driver setting Signed-off-by: Alessandro Boch --- libnetwork/network.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libnetwork/network.go b/libnetwork/network.go index 3f77df8fa8..1d1096f3cb 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -495,7 +495,9 @@ func NetworkOptionPersist(persist bool) NetworkOption { // NetworkOptionIpam function returns an option setter for the ipam configuration for this network func NetworkOptionIpam(ipamDriver string, addrSpace string, ipV4 []*IpamConf, ipV6 []*IpamConf) NetworkOption { return func(n *network) { - n.ipamType = ipamDriver + if ipamDriver != "" { + n.ipamType = ipamDriver + } n.addrSpace = addrSpace n.ipamV4Config = ipV4 n.ipamV6Config = ipV6