docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/google: don't wait for SSH to be ready 

Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
This commit is contained in:
Vincent Bernat 2015-04-11 08:17:57 +02:00
parent 3440ba64fa
commit fbb8898914
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/google/compute_util.go
View File

@ -194,13 +194,6 @@ func (c *ComputeUtil) createInstance(d *Driver) error {
return err
}
instance, err = c.instance()
if err != nil {
return err
}
ip := instance.NetworkInterfaces[0].AccessConfigs[0].NatIP
c.waitForSSH(ip)
// Update the SSH Key
sshKey, err := ioutil.ReadFile(d.GetSSHKeyPath() + ".pub")
if err != nil {
@ -280,12 +273,6 @@ func (c *ComputeUtil) waitForGlobalOp(name string) error {
})
}
// waitForSSH waits for SSH to become ready on the instance.
func (c *ComputeUtil) waitForSSH(ip string) error {
log.Infof("Waiting for SSH...")
return ssh.WaitForTCP(fmt.Sprintf("%s:22", ip))
}
// ip retrieves and returns the external IP address of the instance.
func (c *ComputeUtil) ip() (string, error) {
if c.ipAddress == "" {