From 43b5786001ce871342b392f8d566db3b58669ffa Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Mon, 4 May 2015 22:51:34 -0700
Subject: [PATCH] Default storage driver to "" and let provisioner choose
 default

The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
---
 commands/commands.go                    | 1 -
 libmachine/provision/boot2docker.go     | 4 ++++
 libmachine/provision/ubuntu.go          | 5 +++++
 test/integration/driver-virtualbox.bats | 5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/commands/commands.go b/commands/commands.go
index 639ab4a2d8..06736be40c 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -188,7 +188,6 @@ var sharedCreateFlags = []cli.Flag{
 	cli.StringFlag{
 		Name:  "engine-storage-driver",
 		Usage: "Specify a storage driver to use with the engine",
-		Value: "aufs",
 	},
 	cli.BoolFlag{
 		Name:  "swarm",
diff --git a/libmachine/provision/boot2docker.go b/libmachine/provision/boot2docker.go
index 9677364e3b..33e9952f8c 100644
--- a/libmachine/provision/boot2docker.go
+++ b/libmachine/provision/boot2docker.go
@@ -191,6 +191,10 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.SwarmOpt
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
 
+	if provisioner.EngineOptions.StorageDriver == "" {
+		provisioner.EngineOptions.StorageDriver = "aufs"
+	}
+
 	if err := provisioner.SetHostname(provisioner.Driver.GetMachineName()); err != nil {
 		return err
 	}
diff --git a/libmachine/provision/ubuntu.go b/libmachine/provision/ubuntu.go
index fc4bcd30ba..a3ce4d2924 100644
--- a/libmachine/provision/ubuntu.go
+++ b/libmachine/provision/ubuntu.go
@@ -87,6 +87,11 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+
+	if provisioner.EngineOptions.StorageDriver == "" {
+		provisioner.EngineOptions.StorageDriver = "aufs"
+	}
+
 	if err := provisioner.SetHostname(provisioner.Driver.GetMachineName()); err != nil {
 		return err
 	}
diff --git a/test/integration/driver-virtualbox.bats b/test/integration/driver-virtualbox.bats
index 9ff700d329..fa09cb859b 100644
--- a/test/integration/driver-virtualbox.bats
+++ b/test/integration/driver-virtualbox.bats
@@ -307,6 +307,11 @@ buildMachineWithOldIsoCheckUpgrade() {
   [ "$status" -eq 0  ]
 }
 
+@test "$DRIVER: create with no storage driver" {
+  run machine create -d $DRIVER --engine-storage-driver "" $NAME
+  [ "$status" -eq 0  ]
+}
+
 @test "$DRIVER: create with custom disk, cpu count and memory size flags" {
   run machine create -d $DRIVER --virtualbox-cpu-count $CUSTOM_CPUCOUNT --virtualbox-disk-size $CUSTOM_DISKSIZE --virtualbox-memory $CUSTOM_MEMSIZE $NAME
   [ "$status" -eq 0  ]