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

provider/openstack: gophercloud migration: Make PortID a *string

This commit is contained in:
Joe Topjian 2016-10-16 18:54:36 +00:00
parent 0253dbe51b
commit 1c6b69e342
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/openstack/resource_openstack_lb_vip_v1.go
View File

@ -244,8 +244,9 @@ func resourceLBVipV1Update(d *schema.ResourceData, meta interface{}) error {
// If a floating IP is found we unassign it
if len(fips) == 1 {
portID := ""
updateOpts := floatingips.UpdateOpts{
PortID: "",
PortID: &portID,
}
if err = floatingips.Update(networkingClient, fips[0].ID, updateOpts).Err; err != nil {
return err
@ -338,7 +339,7 @@ func lbVipV1AssignFloatingIP(floatingIP, portID string, networkingClient *gopher
}
updateOpts := floatingips.UpdateOpts{
PortID: portID,
PortID: &portID,
}
if err = floatingips.Update(networkingClient, fips[0].ID, updateOpts).Err; err != nil {
return err

3
builtin/providers/openstack/resource_openstack_networking_floatingip_v2.go
View File

@ -139,7 +139,8 @@ func resourceNetworkFloatingIPV2Update(d *schema.ResourceData, meta interface{})
var updateOpts floatingips.UpdateOpts
if d.HasChange("port_id") {
updateOpts.PortID = d.Get("port_id").(string)
portID := d.Get("port_id").(string)
updateOpts.PortID = &portID
}
log.Printf("[DEBUG] Update Options: %#v", updateOpts)