Merge pull request #1623 from hashicorp/b-private-ip-ssh

providers/aws: if no public IP, use private IP for SSH by default
hashicorp · Apr 22, 2015 · c1464b1 · c1464b1
2 parents 341b2ff + ec38a65
commit c1464b1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go
@@ -544,6 +544,11 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
 			"type": "ssh",
 			"host": *instance.PublicIPAddress,
 		})
+	} else if instance.PrivateIPAddress != nil {
+		d.SetConnInfo(map[string]string{
+			"type": "ssh",
+			"host": *instance.PrivateIPAddress,
+		})
 	}
 
 	// Set our attributes