diff --git a/drivers/exoscale/exoscale.go b/drivers/exoscale/exoscale.go index 55628b3167..e083e3f0d5 100644 --- a/drivers/exoscale/exoscale.go +++ b/drivers/exoscale/exoscale.go @@ -188,10 +188,6 @@ func (d *Driver) GetState() (state.State, error) { return state.None, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) createDefaultSecurityGroup(client *egoscale.Client, group string) (string, error) { rules := []egoscale.SecurityGroupRule{ { diff --git a/drivers/fakedriver/fakedriver.go b/drivers/fakedriver/fakedriver.go index 8a8e5b2e92..1a41e15f8e 100644 --- a/drivers/fakedriver/fakedriver.go +++ b/drivers/fakedriver/fakedriver.go @@ -57,10 +57,6 @@ func (d *Driver) GetState() (state.State, error) { return d.MockState, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) Create() error { return nil } diff --git a/drivers/google/google.go b/drivers/google/google.go index 1f839b9069..4f1f3c1ba4 100644 --- a/drivers/google/google.go +++ b/drivers/google/google.go @@ -165,12 +165,6 @@ func (d *Driver) initApis() (*ComputeUtil, error) { return newComputeUtil(d) } -// PreCreateCheck allows for pre-create operations to make sure a driver is ready for creation -// It's a noop on GCE. -func (d *Driver) PreCreateCheck() error { - return nil -} - // Create creates a GCE VM instance acting as a docker host. func (d *Driver) Create() error { c, err := newComputeUtil(d) diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go index 7e4e63b194..c9262a16cd 100644 --- a/drivers/hyperv/hyperv.go +++ b/drivers/hyperv/hyperv.go @@ -101,10 +101,6 @@ func (d *Driver) DriverName() string { return "hyperv" } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) GetURL() (string, error) { ip, err := d.GetIP() if err != nil { diff --git a/drivers/none/driver.go b/drivers/none/driver.go index d89c981208..9d0396586a 100644 --- a/drivers/none/driver.go +++ b/drivers/none/driver.go @@ -82,10 +82,6 @@ func (d *Driver) Kill() error { return fmt.Errorf("hosts without a driver cannot be killed") } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) Remove() error { return nil } diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go index 8b034a4a8f..fc5e9e03ba 100644 --- a/drivers/openstack/openstack.go +++ b/drivers/openstack/openstack.go @@ -335,10 +335,6 @@ func (d *Driver) GetState() (state.State, error) { return state.None, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) Create() error { d.KeyPairName = fmt.Sprintf("%s-%s", d.MachineName, mcnutils.GenerateRandomID()) diff --git a/drivers/softlayer/driver.go b/drivers/softlayer/driver.go index 3c6a845d1e..5352d3406a 100644 --- a/drivers/softlayer/driver.go +++ b/drivers/softlayer/driver.go @@ -303,10 +303,6 @@ func (d *Driver) GetActiveTransaction() (string, error) { return t, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) waitForStart() { log.Infof("Waiting for host to become available") for { diff --git a/drivers/vmwarefusion/fusion.go b/drivers/vmwarefusion/fusion.go index 994224bc38..132038f19e 100644 --- a/drivers/vmwarefusion/fusion.go +++ b/drivers/vmwarefusion/fusion.go @@ -198,10 +198,6 @@ func (d *Driver) GetState() (state.State, error) { return state.Stopped, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) Create() error { b2dutils := mcnutils.NewB2dUtils("", "", d.StorePath) if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil { diff --git a/drivers/vmwarevcloudair/vcloudair.go b/drivers/vmwarevcloudair/vcloudair.go index 18b8e7b1f2..285ada3e80 100644 --- a/drivers/vmwarevcloudair/vcloudair.go +++ b/drivers/vmwarevcloudair/vcloudair.go @@ -241,10 +241,6 @@ func (d *Driver) GetState() (state.State, error) { } -func (d *Driver) PreCreateCheck() error { - return nil -} - func (d *Driver) Create() error { key, err := d.createSSHKey() diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go index 844aa1d17d..0bea2f77dd 100644 --- a/drivers/vmwarevsphere/vsphere.go +++ b/drivers/vmwarevsphere/vsphere.go @@ -212,10 +212,6 @@ func (d *Driver) GetState() (state.State, error) { return state.None, nil } -func (d *Driver) PreCreateCheck() error { - return nil -} - // the current implementation does the following: // 1. check whether the docker directory contains the boot2docker ISO // 2. generate an SSH keypair and bundle it in a tar. diff --git a/libmachine/drivers/base.go b/libmachine/drivers/base.go index 3d7039a381..48e16a9df4 100644 --- a/libmachine/drivers/base.go +++ b/libmachine/drivers/base.go @@ -52,3 +52,8 @@ func (d *BaseDriver) GetSSHUsername() string { return d.SSHUser } + +// PreCreateCheck is called to enforce pre-creation steps +func (d *BaseDriver) PreCreateCheck() error { + return nil +}