builder/vmware: error if guest IP is blank [GH-189]

This commit is contained in:
Mitchell Hashimoto 2013-07-16 11:05:47 -07:00
parent 8e1e40c096
commit 29279415d0
3 changed files with 11 additions and 0 deletions

View File

@ -45,6 +45,7 @@ BUG FIXES:
place. [GH-152]
* virtualbox: "paused" doesn't mean the VM is stopped, improving
shutdown detection.
* vmware: error if guest IP could not be detected. [GH-189]
## 0.1.5 (July 7, 2013)

View File

@ -1,6 +1,7 @@
package vmware
import (
"errors"
"fmt"
"io/ioutil"
"os"
@ -68,5 +69,9 @@ func (f *DHCPLeaseGuestLookup) GuestIP() (string, error) {
}
}
if curIp == "" {
return "", errors.New("IP not found for MAC in DHCP leases")
}
return curIp, nil
}

View File

@ -47,6 +47,11 @@ func sshAddress(state map[string]interface{}) (string, error) {
return "", fmt.Errorf("IP lookup failed: %s", err)
}
if ipAddress == "" {
log.Println("IP is blank, no IP yet.")
return "", errors.New("IP is blank")
}
log.Printf("Detected IP: %s", ipAddress)
return fmt.Sprintf("%s:%d", ipAddress, config.SSHPort), nil
}