set default host on connection info
This commit is contained in:
parent
fe4e89bef7
commit
afa1666cad
|
@ -340,17 +340,27 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
|
||||||
d.Set("can_ip_forward", instance.CanIpForward)
|
d.Set("can_ip_forward", instance.CanIpForward)
|
||||||
|
|
||||||
// Set the networks
|
// Set the networks
|
||||||
|
externalIP := ""
|
||||||
for i, iface := range instance.NetworkInterfaces {
|
for i, iface := range instance.NetworkInterfaces {
|
||||||
prefix := fmt.Sprintf("network.%d", i)
|
prefix := fmt.Sprintf("network.%d", i)
|
||||||
d.Set(prefix+".name", iface.Name)
|
d.Set(prefix+".name", iface.Name)
|
||||||
|
|
||||||
if len(iface.AccessConfigs) > 0 {
|
// Use the first external IP found for the default connection info.
|
||||||
// Get the first one.
|
natIP := resourceInstanceNatIP(iface)
|
||||||
d.Set(prefix+".external_address", iface.AccessConfigs[0].NatIP)
|
if externalIP == "" && natIP != "" {
|
||||||
|
externalIP = natIP
|
||||||
}
|
}
|
||||||
|
d.Set(prefix+".external_address", natIP)
|
||||||
|
|
||||||
d.Set(prefix+".internal_address", iface.NetworkIP)
|
d.Set(prefix+".internal_address", iface.NetworkIP)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Initialize the connection info
|
||||||
|
d.SetConnInfo(map[string]string{
|
||||||
|
"type": "ssh",
|
||||||
|
"host": externalIP,
|
||||||
|
})
|
||||||
|
|
||||||
// Set the metadata fingerprint if there is one.
|
// Set the metadata fingerprint if there is one.
|
||||||
if instance.Metadata != nil {
|
if instance.Metadata != nil {
|
||||||
d.Set("metadata_fingerprint", instance.Metadata.Fingerprint)
|
d.Set("metadata_fingerprint", instance.Metadata.Fingerprint)
|
||||||
|
@ -516,3 +526,16 @@ func resourceInstanceTags(d *schema.ResourceData) *compute.Tags {
|
||||||
|
|
||||||
return tags
|
return tags
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resourceInstanceNatIP acquires the first NatIP with a "ONE_TO_ONE_NAT" type
|
||||||
|
// in the compute.NetworkInterface's AccessConfigs.
|
||||||
|
func resourceInstanceNatIP(iface *compute.NetworkInterface) (natIP string) {
|
||||||
|
for _, config := range iface.AccessConfigs {
|
||||||
|
if config.Type == "ONE_TO_ONE_NAT" {
|
||||||
|
natIP = config.NatIP
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return natIP
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue