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

Wait for SSH before daemon detection 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2016-02-04 10:56:31 -08:00
parent 7660fedf4b
commit 5ced31397e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmachine/libmachine.go
View File

@ -162,11 +162,6 @@ func (api *Client) performCreate(h *host.Host) error {
return fmt.Errorf("Error waiting for machine to be running: %s", err) return fmt.Errorf("Error waiting for machine to be running: %s", err)
} }
log.Info("Machine is running, waiting for SSH to be available...")
if err := drivers.WaitForSSH(h.Driver); err != nil {
return fmt.Errorf("Error waiting for SSH: %s", err)
}
log.Info("Detecting operating system of created instance...") log.Info("Detecting operating system of created instance...")
provisioner, err := provision.DetectProvisioner(h.Driver) provisioner, err := provision.DetectProvisioner(h.Driver)
if err != nil { if err != nil {

5
libmachine/provision/provisioner.go
View File

@ -94,6 +94,11 @@ func DetectProvisioner(d drivers.Driver) (Provisioner, error) {
} }
func (detector StandardDetector) DetectProvisioner(d drivers.Driver) (Provisioner, error) { func (detector StandardDetector) DetectProvisioner(d drivers.Driver) (Provisioner, error) {
log.Info("Waiting for SSH to be available...")
if err := drivers.WaitForSSH(d); err != nil {
return nil, err
}
log.Info("Detecting the provisioner...") log.Info("Detecting the provisioner...")
osReleaseOut, err := drivers.RunSSHCommandFromDriver(d, "cat /etc/os-release") osReleaseOut, err := drivers.RunSSHCommandFromDriver(d, "cat /etc/os-release")