From 867e9d1c8fbde8535bc848cb932d284239fa7e27 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 19 Jun 2013 13:26:08 -0700
Subject: [PATCH] builder/digitalocean: timeout TCP connections to SSH

---
 builder/digitalocean/step_connect_ssh.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/builder/digitalocean/step_connect_ssh.go b/builder/digitalocean/step_connect_ssh.go
index 7e0bcd9ed..e7af18628 100644
--- a/builder/digitalocean/step_connect_ssh.go
+++ b/builder/digitalocean/step_connect_ssh.go
@@ -61,7 +61,10 @@ func (s *stepConnectSSH) Run(state map[string]interface{}) multistep.StepAction
 			log.Printf(
 				"Opening TCP conn for SSH to %s:%d (attempt %d)",
 				ipAddress, config.SSHPort, attempts)
-			s.conn, err = net.Dial("tcp", fmt.Sprintf("%s:%d", ipAddress, config.SSHPort))
+			s.conn, err = net.DialTimeout(
+				"tcp",
+				fmt.Sprintf("%s:%d", ipAddress, config.SSHPort),
+				10*time.Second)
 			if err == nil {
 				break
 			}