Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

generic: update for upstream driver specification

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2015-04-22 17:56:57 -04:00
parent 94ccd5cd5a
commit 4e64ff79f9
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/generic/generic.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/codegangsta/cli"
"github.com/docker/machine/drivers"
"github.com/docker/machine/provider"
"github.com/docker/machine/ssh"
"github.com/docker/machine/state"
"github.com/docker/machine/utils"
)
@@ -144,11 +143,7 @@ func (d *Driver) Create() error {
return err
}
log.Infof("Waiting for SSH...")
if err := ssh.WaitForTCP(fmt.Sprintf("%s:%d", d.IPAddress, d.SSHPort)); err != nil {
return err
}
log.Debugf("IP: %s", d.IPAddress)
return nil
}
@@ -195,11 +190,7 @@ func (d *Driver) Remove() error {
func (d *Driver) Restart() error {
log.Debug("Restarting...")
cmd, err := drivers.GetSSHCommandFromDriver(d, "sudo shutdown -r now")
if err != nil {
return err
}
if err := cmd.Run(); err != nil {
if _, err := drivers.RunSSHCommandFromDriver(d, "sudo shutdown -r now"); err != nil {
return err
}
@@ -209,11 +200,7 @@ func (d *Driver) Restart() error {
func (d *Driver) Kill() error {
log.Debug("Killing...")
cmd, err := drivers.GetSSHCommandFromDriver(d, "sudo shutdown -P now")
if err != nil {
return err
}
if err := cmd.Run(); err != nil {
if _, err := drivers.RunSSHCommandFromDriver(d, "sudo shutdown -P now"); err != nil {
return err
}

1
drivers/generic/generic_test.go Normal file
View File

@@ -0,0 +1 @@
package generic

2
libmachine/provision/ubuntu.go
View File

@@ -75,7 +75,7 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
func (provisioner *UbuntuProvisioner) dockerDaemonResponding() bool {
if _, err := provisioner.SSHCommand("sudo docker version"); err != nil {
log.Warn("Error getting SSH command to check if the daemon is up: %s", err)
log.Warnf("Error getting SSH command to check if the daemon is up: %s", err)
return false
}