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

provider/openstack: gophercloud migration: Account for subnets and networks still in use

This commit is contained in:
Joe Topjian 2016-10-12 20:42:15 +00:00
parent 394c26c6cc
commit ea4209c61c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,11 @@ func waitForNetworkDelete(networkingClient *gophercloud.ServiceClient, networkId
log.Printf("[DEBUG] Successfully deleted OpenStack Network %s", networkId) log.Printf("[DEBUG] Successfully deleted OpenStack Network %s", networkId)
return n, "DELETED", nil return n, "DELETED", nil
} }
if errCode, ok := err.(gophercloud.ErrUnexpectedResponseCode); ok {
if errCode.Actual == 409 {
return n, "ACTIVE", nil
}
}
return n, "ACTIVE", err return n, "ACTIVE", err
} }

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

@ -385,6 +385,11 @@ func waitForSubnetDelete(networkingClient *gophercloud.ServiceClient, subnetId s
log.Printf("[DEBUG] Successfully deleted OpenStack Subnet %s", subnetId) log.Printf("[DEBUG] Successfully deleted OpenStack Subnet %s", subnetId)
return s, "DELETED", nil return s, "DELETED", nil
} }
if errCode, ok := err.(gophercloud.ErrUnexpectedResponseCode); ok {
if errCode.Actual == 409 {
return s, "ACTIVE", nil
}
}
return s, "ACTIVE", err return s, "ACTIVE", err
} }