builder/amazon/common: SSH into private IP if in VPC

2013-07-21 22:48:58 -07:00 · 2013-07-21 22:48:58 -07:00 · 3efdb009d7
parent b9b5de5684
commit 3efdb009d7
1 changed files with 8 additions and 1 deletions
--- a/builder/amazon/common/ssh.go
+++ b/builder/amazon/common/ssh.go
@ -11,8 +11,15 @@ import (
 // for determining the SSH address based on the instance DNS name.
 func SSHAddress(port int) func(map[string]interface{}) (string, error) {
 	return func(state map[string]interface{}) (string, error) {
+		var host string
 		instance := state["instance"].(*ec2.Instance)
-		return fmt.Sprintf("%s:%d", instance.DNSName, port), nil
+		if instance.VpcId != "" {
+			host = instance.PrivateIpAddress
+		} else {
+			host = instance.DNSName
+		}
+
+		return fmt.Sprintf("%s:%d", host, port), nil
 	}
 }