ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5366 from jtopjian/openstack-readd-server-access 

provider/openstack: Re-Add server.AccessIPv4 and server.AccessIPv6
This commit is contained in:
Joe Topjian 2016-02-29 08:44:16 -07:00
parent 0ddf8f4dbd 7d6116d7c2
commit b72cb19606
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/openstack/resource_openstack_compute_instance_v2.go
View File

@ -497,6 +497,14 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err
// Determine the best IPv4 and IPv6 addresses to access the instance with // Determine the best IPv4 and IPv6 addresses to access the instance with
hostv4, hostv6 := getInstanceAccessAddresses(d, networks) hostv4, hostv6 := getInstanceAccessAddresses(d, networks)
if server.AccessIPv4 != "" && hostv4 == "" {
hostv4 = server.AccessIPv4
}
if server.AccessIPv6 != "" && hostv6 == "" {
hostv6 = server.AccessIPv6
}
d.Set("network", networks) d.Set("network", networks)
d.Set("access_ip_v4", hostv4) d.Set("access_ip_v4", hostv4)
d.Set("access_ip_v6", hostv6) d.Set("access_ip_v6", hostv6)