Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

provider/openstack: Re-Add server.AccessIPv4 and server.AccessIPv6 #5366

Merged
merged 1 commit into from
Feb 29, 2016
Merged

provider/openstack: Re-Add server.AccessIPv4 and server.AccessIPv6 #5366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions builtin/providers/openstack/resource_openstack_compute_instance_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,14 @@ func resourceComputeInstanceV2Read(d *schema.ResourceData, meta interface{}) err
// Determine the best IPv4 and IPv6 addresses to access the instance with
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("access_ip_v4", hostv4)
d.Set("access_ip_v6", hostv6)
Expand Down