provider/openstack: gophercloud migration: fixing dhcp and gateway co…

…nfiguration
hashicorp · Oct 23, 2016 · 17b1787 · 17b1787
1 parent 1c6b69e
commit 17b1787
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go b/builtin/providers/openstack/resource_openstack_networking_subnet_v2.go
@@ -155,11 +155,14 @@ func resourceNetworkingSubnetV2Create(d *schema.ResourceData, meta interface{})
 		createOpts.GatewayIP = &gatewayIP
 	}
 
-	if v, ok := d.GetOk("enable_dhcp"); ok {
-		enableDHCP := v.(bool)
-		createOpts.EnableDHCP = &enableDHCP
+	if noGateway {
+		disableGateway := ""
+		createOpts.GatewayIP = &disableGateway
 	}
 
+	enableDHCP := d.Get("enable_dhcp").(bool)
+	createOpts.EnableDHCP = &enableDHCP
+
 	if v, ok := d.GetOk("ip_version"); ok {
 		ipVersion := resourceNetworkingSubnetV2DetermineIPVersion(v.(int))
 		createOpts.IPVersion = ipVersion