Remove useless duplication on PreCreateCheck

Signed-off-by: Olivier Gambier <olivier@docker.com>
This commit is contained in:
Olivier Gambier
2015-10-20 18:35:13 -07:00
parent de5d052985
commit bf3cd8b8f4
11 changed files with 5 additions and 42 deletions
-4
View File
@@ -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{
{
-4
View File
@@ -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
}
-6
View File
@@ -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)
-4
View File
@@ -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 {
-4
View File
@@ -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
}
-4
View File
@@ -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())
-4
View File
@@ -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 {
-4
View File
@@ -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 {
-4
View File
@@ -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()
-4
View File
@@ -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.
+5
View File
@@ -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
}