From b198b1edefd4e3890810717b72b12ddb2d612963 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 22 Feb 2019 18:39:54 +0100 Subject: vm/vmimpl: don't pass ssh key twice --- vm/vmimpl/util.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vm/vmimpl') diff --git a/vm/vmimpl/util.go b/vm/vmimpl/util.go index 1df9f4359..c7462c2cf 100644 --- a/vm/vmimpl/util.go +++ b/vm/vmimpl/util.go @@ -41,6 +41,9 @@ func WaitForSSH(debug bool, timeout time.Duration, addr, sshKey, sshUser, OS str if err == nil { return nil } + if debug { + log.Logf(0, "ssh failed: %v", err) + } if time.Since(startTime) > timeout { return &osutil.VerboseError{Title: "can't ssh into the instance", Output: []byte(err.Error())} } @@ -58,7 +61,6 @@ func SCPArgs(debug bool, sshKey string, port int) []string { func sshArgs(debug bool, sshKey, portArg string, port int) []string { args := []string{ portArg, fmt.Sprint(port), - "-i", sshKey, "-F", "/dev/null", "-o", "UserKnownHostsFile=/dev/null", "-o", "BatchMode=yes", -- cgit mrf-deployment