iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3836 from mahcsig/3833-incorrect-ssh-port 

Issue 3833 - fix for port error in PR 3347
This commit is contained in:
Rickard von Essen 2016-09-01 20:52:56 +02:00 committed by GitHub
parent d1e38052f7 c1e129848c
commit 16158622fe
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/vmware/iso/driver_esx5.go
View File

@ -242,6 +242,11 @@ func (ESX5Driver) UpdateVMX(_, password string, port uint, data map[string]strin
func (d *ESX5Driver) CommHost(state multistep.StateBag) (string, error) { func (d *ESX5Driver) CommHost(state multistep.StateBag) (string, error) {
config := state.Get("config").(*Config) config := state.Get("config").(*Config)
sshc := config.SSHConfig.Comm
port := sshc.SSHPort
if sshc.Type == "winrm" {
port = sshc.WinRMPort
}
if address, ok := state.GetOk("vm_address"); ok { if address, ok := state.GetOk("vm_address"); ok {
return address.(string), nil return address.(string), nil
@ -286,7 +291,7 @@ func (d *ESX5Driver) CommHost(state multistep.StateBag) (string, error) {
} }
// When multiple NICs are connected to the same network, choose // When multiple NICs are connected to the same network, choose
// one that has a route back. This Dial should ensure that. // one that has a route back. This Dial should ensure that.
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", record["IPAddress"], d.Port), 2*time.Second) conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", record["IPAddress"], port), 2*time.Second)
if err != nil { if err != nil {
if e, ok := err.(*net.OpError); ok { if e, ok := err.(*net.OpError); ok {
if e.Timeout() { if e.Timeout() {