From 5ced31397e42541367a910ef60dc25378d7a79cb Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Thu, 4 Feb 2016 10:56:31 -0800 Subject: [PATCH] Wait for SSH before daemon detection Signed-off-by: Nathan LeClaire --- libmachine/libmachine.go | 5 ----- libmachine/provision/provisioner.go | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libmachine/libmachine.go b/libmachine/libmachine.go index 1eb1b2a20b..986d4ffc38 100644 --- a/libmachine/libmachine.go +++ b/libmachine/libmachine.go @@ -162,11 +162,6 @@ func (api *Client) performCreate(h *host.Host) error { 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...") provisioner, err := provision.DetectProvisioner(h.Driver) if err != nil { diff --git a/libmachine/provision/provisioner.go b/libmachine/provision/provisioner.go index 2c55913532..3325fa9fbf 100644 --- a/libmachine/provision/provisioner.go +++ b/libmachine/provision/provisioner.go @@ -94,6 +94,11 @@ func 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...") osReleaseOut, err := drivers.RunSSHCommandFromDriver(d, "cat /etc/os-release")