provider/openstack: extend docs with info about fixed ips and make fi…

…xed ips attrs required
hashicorp · Nov 5, 2015 · 69f06c1 · 69f06c1
1 parent b19ba7a
commit 69f06c1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/builtin/providers/openstack/resource_openstack_networking_network_v2_test.go b/builtin/providers/openstack/resource_openstack_networking_network_v2_test.go
@@ -150,7 +150,10 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
       admin_state_up = "true"
       security_groups = ["${openstack_compute_secgroup_v2.foo.id}"]
 
-      depends_on = ["openstack_networking_subnet_v2.foo"]
+			fixed_ips {
+				"subnet_id" =  "008ba151-0b8c-4a67-98b5-0d2b87666062"
+				"ip_address" =  "172.24.4.2"
+			}
     }
 
     resource "openstack_compute_instance_v2" "foo" {

diff --git a/builtin/providers/openstack/resource_openstack_networking_port_v2.go b/builtin/providers/openstack/resource_openstack_networking_port_v2.go
@@ -86,11 +86,11 @@ func resourceNetworkingPortV2() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"subnet_id": &schema.Schema{
 							Type:     schema.TypeString,
-							Optional: true,
+							Required: true,
 						},
 						"ip_address": &schema.Schema{
 							Type:     schema.TypeString,
-							Optional: true,
+							Required: true,
 						},
 					},
 				},

diff --git a/builtin/providers/openstack/resource_openstack_networking_port_v2_test.go b/builtin/providers/openstack/resource_openstack_networking_port_v2_test.go
@@ -32,6 +32,7 @@ func TestAccNetworkingV2Port_basic(t *testing.T) {
 			admin_state_up = "true"
 			fixed_ips {
  					ip_address = "192.168.0.0"
+					subnet_id = "008ba151-0b8c-4a67-98b5-0d2b87666062"
 			}
 		}`, region, region)
 

diff --git a/website/source/docs/providers/openstack/r/networking_network_v2.html.markdown b/website/source/docs/providers/openstack/r/networking_network_v2.html.markdown
@@ -42,7 +42,10 @@ resource "openstack_networking_port_v2" "port_1" {
   admin_state_up = "true"
   security_groups = ["${openstack_compute_secgroup_v2.secgroup_1.id}"]
 
-  depends_on = ["openstack_networking_subnet_v2.subnet_1"]
+  fixed_ips {
+      "subnet_id" =  "008ba151-0b8c-4a67-98b5-0d2b87666062"
+      "ip_address" =  "172.24.4.2"
+  }
 }
 
 resource "openstack_compute_instance_v2" "instance_1" {

diff --git a/website/source/docs/providers/openstack/r/networking_port_v2.html.markdown b/website/source/docs/providers/openstack/r/networking_port_v2.html.markdown
@@ -60,6 +60,17 @@ The following arguments are supported:
 * `device_id` - (Optional) The ID of the device attached to the port. Changing this
     creates a new port.
 
+* `fixed_ips` - (Optional) An array of desired IPs for this port. 
+
+
+The `fixed_ips` block supports:
+
+* `subnet_id` - (Required) Subnet in which to allocate IP address for
+this port.
+
+* `ip_address` - (Required) IP address desired in the subnet for this
+port.
+
 ## Attributes Reference
 
 The following attributes are exported: