change ordering of ssh connection IP for amazon. fixes #1559

This commit is contained in:
Greg Cockburn 2014-12-01 10:44:52 +11:00
parent e5c0bf14df
commit dbaf865e59
1 changed files with 3 additions and 3 deletions

View File

@ -16,14 +16,14 @@ func SSHAddress(e *ec2.EC2, port int, private bool) func(multistep.StateBag) (st
for j := 0; j < 2; j++ {
var host string
i := state.Get("instance").(*ec2.Instance)
if i.DNSName != "" {
host = i.DNSName
} else if i.VpcId != "" {
if i.VpcId != "" {
if i.PublicIpAddress != "" && !private {
host = i.PublicIpAddress
} else {
host = i.PrivateIpAddress
}
} else if i.DNSName != "" {
host = i.DNSName
}
if host != "" {