Merge pull request #3636 from rakutentech/fix-connection-info

provider/vsphere: Fix d.SetConnInfo error in case of a missing IP address
This commit is contained in:
Paul Hinze 2015-10-29 07:28:16 -05:00
commit 38c20a58c7
1 changed files with 7 additions and 4 deletions

View File

@ -389,6 +389,7 @@ func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{})
networkInterfaces = append(networkInterfaces, networkInterface) networkInterfaces = append(networkInterfaces, networkInterface)
} }
} }
log.Printf("[DEBUG] networkInterfaces: %#v", networkInterfaces)
err = d.Set("network_interface", networkInterfaces) err = d.Set("network_interface", networkInterfaces)
if err != nil { if err != nil {
return fmt.Errorf("Invalid network interfaces to set: %#v", networkInterfaces) return fmt.Errorf("Invalid network interfaces to set: %#v", networkInterfaces)
@ -420,10 +421,12 @@ func resourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{})
d.Set("datastore", rootDatastore) d.Set("datastore", rootDatastore)
// Initialize the connection info // Initialize the connection info
d.SetConnInfo(map[string]string{ if len(networkInterfaces) > 0 {
"type": "ssh", d.SetConnInfo(map[string]string{
"host": networkInterfaces[0]["ip_address"].(string), "type": "ssh",
}) "host": networkInterfaces[0]["ip_address"].(string),
})
}
return nil return nil
} }