Merge pull request #4617 from ebsco/master

Fix to not put fixed_ip in request if not defined
hashicorp · Jan 11, 2016 · f1b55de · f1b55de
2 parents 84014ed + 1de2fde
commit f1b55de
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/builtin/providers/openstack/resource_openstack_networking_port_v2.go b/builtin/providers/openstack/resource_openstack_networking_port_v2.go
@@ -245,8 +245,13 @@ func resourcePortSecurityGroupsV2(d *schema.ResourceData) []string {
 	return groups
 }
 
-func resourcePortFixedIpsV2(d *schema.ResourceData) []ports.IP {
+func resourcePortFixedIpsV2(d *schema.ResourceData) interface{} {
 	rawIP := d.Get("fixed_ip").([]interface{})
+
+	if len(rawIP) == 0 {
+		return nil
+	}
+
 	ip := make([]ports.IP, len(rawIP))
 	for i, raw := range rawIP {
 		rawMap := raw.(map[string]interface{})
@@ -255,8 +260,8 @@ func resourcePortFixedIpsV2(d *schema.ResourceData) []ports.IP {
 			IPAddress: rawMap["ip_address"].(string),
 		}
 	}
-
 	return ip
+
 }
 
 func resourcePortAdminStateUpV2(d *schema.ResourceData) *bool {