From 46afc8f1486ff4517cf3cda69b807fcd6c8ba2da Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 2 Jan 2017 17:50:40 +0100 Subject: [PATCH] Change the way IPAM configuration is handled on stack deploy We use the 'default' driver if none is specified. 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 1d9877f93c..4d21b4df0a 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, }, }