From 961ca9c7367515949de145df0d030f09b200ec0f Mon Sep 17 00:00:00 2001 From: David Calavera Date: Thu, 29 Oct 2015 16:48:25 -0400 Subject: [PATCH] Let the api to choose the default network driver. That way swarm can understand the user's intention. Signed-off-by: David Calavera Upstream-commit: 34668ad68bb42d7488649e41b32818f3f1a7cff2 Component: engine --- components/engine/api/client/network.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/components/engine/api/client/network.go b/components/engine/api/client/network.go index 67fc7e8a81..8cd72a884e 100644 --- a/components/engine/api/client/network.go +++ b/components/engine/api/client/network.go @@ -54,6 +54,13 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error { return err } + // Set the default driver to "" if the user didn't set the value. + // That way we can know whether it was user input or not. + driver := *flDriver + if !cmd.IsSet("-driver") && !cmd.IsSet("d") { + driver = "" + } + ipamCfg, err := consolidateIpam(flIpamSubnet.GetAll(), flIpamIPRange.GetAll(), flIpamGateway.GetAll(), flIpamAux.GetAll()) if err != nil { return err @@ -62,7 +69,7 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error { // Construct network create request body nc := types.NetworkCreate{ Name: cmd.Arg(0), - Driver: *flDriver, + Driver: driver, IPAM: network.IPAM{Driver: *flIpamDriver, Config: ipamCfg}, Options: flOpts.GetAll(), CheckDuplicate: true,