|
|
|
|
@ -8,7 +8,6 @@ import (
|
|
|
|
|
"github.com/mitchellh/multistep"
|
|
|
|
|
"github.com/mitchellh/packer/communicator/ssh"
|
|
|
|
|
"time"
|
|
|
|
|
"log"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// SSHAddress returns a function that can be given to the SSH communicator
|
|
|
|
|
@ -21,12 +20,9 @@ func SSHAddress(e *ec2.EC2, port int) func(multistep.StateBag) (string, error) {
|
|
|
|
|
if i.DNSName != "" {
|
|
|
|
|
host = i.DNSName
|
|
|
|
|
} else if i.VpcId != "" {
|
|
|
|
|
log.Printf("public ip from SSHAddress: %s", i.PublicIpAddress)
|
|
|
|
|
if i.PublicIpAddress != "" {
|
|
|
|
|
log.Printf("using public ip in SSHAddress")
|
|
|
|
|
host = i.PublicIpAddress
|
|
|
|
|
} else {
|
|
|
|
|
log.Printf("using private ip in SSHAddress")
|
|
|
|
|
host = i.PrivateIpAddress
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|