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

provider/openstack: Don't allow floating IP and port (#12099) 

This commit adds a check to prevent a user from specifying both
a floating IP and a port on a specific network. While this
configuration is currently allowed, the Port will be chosen and
applying the configuration again will show a state mismatch. This
attempts to prevent such a misconfiguration.
This commit is contained in:
Joe Topjian 2017-02-20 05:32:28 -07:00 committed by Paul Stack
parent af28c2b3d6
commit 6d4fc8d21a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -990,6 +990,15 @@ func getInstanceNetworks(computeClient *gophercloud.ServiceClient, d *schema.Res
rawMap := raw.(map[string]interface{})
// Both a floating IP and a port cannot be specified
if fip, ok := rawMap["floating_ip"].(string); ok {
if port, ok := rawMap["port"].(string); ok {
if fip != "" && port != "" {
return nil, fmt.Errorf("Only one of a floating IP or port may be specified per network.")
}
}
}
allPages, err := tenantnetworks.List(computeClient).AllPages()
if err != nil {
if _, ok := err.(gophercloud.ErrDefault404); ok {