From c3220641274bb99e120a1b3dd64078f02589717b Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 1 Feb 2017 15:54:56 +0100 Subject: [PATCH] Use default driver for IPAM if none Signed-off-by: Vincent Demeester --- daemon/cluster/convert/network.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/daemon/cluster/convert/network.go b/daemon/cluster/convert/network.go index 1902550847..c28bc2b503 100644 --- a/daemon/cluster/convert/network.go +++ b/daemon/cluster/convert/network.go @@ -186,9 +186,13 @@ func BasicNetworkCreateToGRPC(create basictypes.NetworkCreateRequest) swarmapi.N Attachable: create.Attachable, } if create.IPAM != nil { + driver := create.IPAM.Driver + if driver == "" { + driver = "default" + } ns.IPAM = &swarmapi.IPAMOptions{ Driver: &swarmapi.Driver{ - Name: create.IPAM.Driver, + Name: driver, Options: create.IPAM.Options, }, }