Browse code

Let the api to choose the default network driver.

That way swarm can understand the user's intention.

Signed-off-by: David Calavera <david.calavera@gmail.com>

David Calavera authored on 2015/10/30 05:48:25
Showing 1 changed files
... ...
@@ -54,6 +54,13 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error {
54 54
 		return err
55 55
 	}
56 56
 
57
+	// Set the default driver to "" if the user didn't set the value.
58
+	// That way we can know whether it was user input or not.
59
+	driver := *flDriver
60
+	if !cmd.IsSet("-driver") && !cmd.IsSet("d") {
61
+		driver = ""
62
+	}
63
+
57 64
 	ipamCfg, err := consolidateIpam(flIpamSubnet.GetAll(), flIpamIPRange.GetAll(), flIpamGateway.GetAll(), flIpamAux.GetAll())
58 65
 	if err != nil {
59 66
 		return err
... ...
@@ -62,7 +69,7 @@ func (cli *DockerCli) CmdNetworkCreate(args ...string) error {
62 62
 	// Construct network create request body
63 63
 	nc := types.NetworkCreate{
64 64
 		Name:           cmd.Arg(0),
65
-		Driver:         *flDriver,
65
+		Driver:         driver,
66 66
 		IPAM:           network.IPAM{Driver: *flIpamDriver, Config: ipamCfg},
67 67
 		Options:        flOpts.GetAll(),
68 68
 		CheckDuplicate: true,