Merge pull request #365 from F5Networks/1.4_vendor_update

1.4 vendor update and doc changes
F5Networks · Oct 24, 2020 · d8f363b · d8f363b
2 parents 3b6a0a8 + 8dc6d6b
commit d8f363b
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@
 module github.com/F5Networks/terraform-provider-bigip
 
 require (
-	github.com/f5devcentral/go-bigip v0.0.0-20201014184950-5a84faa373bd
+	github.com/f5devcentral/go-bigip v0.0.0-20201023175349-07af362653f5
 	github.com/f5devcentral/go-bigip/f5teem v0.0.0-20201014184950-5a84faa373bd
 	github.com/google/uuid v1.1.1
 	github.com/hashicorp/hcl v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -36,8 +36,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/f5devcentral/go-bigip v0.0.0-20201014184950-5a84faa373bd h1:E/mDFU8YizETIRhpZX33H7Tj56duVlbl+H49JIeAG1w=
-github.com/f5devcentral/go-bigip v0.0.0-20201014184950-5a84faa373bd/go.mod h1:JZj/iVxDmEnGPyEwuNj7x0fuH2CtUBbD2J48MMp/SE8=
+github.com/f5devcentral/go-bigip v0.0.0-20201023175349-07af362653f5 h1:aSvAWr81NyAZwoUnGkmuWlGmvhH30eEi9+nD7HWM6a8=
+github.com/f5devcentral/go-bigip v0.0.0-20201023175349-07af362653f5/go.mod h1:JZj/iVxDmEnGPyEwuNj7x0fuH2CtUBbD2J48MMp/SE8=
 github.com/f5devcentral/go-bigip/f5teem v0.0.0-20201014184950-5a84faa373bd h1:fNTYTEyb1JbzCym7cc0SqO41gAkY6uep57dd+e9/IDU=
 github.com/f5devcentral/go-bigip/f5teem v0.0.0-20201014184950-5a84faa373bd/go.mod h1:1Ly3xA1+0ydxV5iDxUBmOt4saqtbFZmxFxcRCcs6Xfk=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=

diff --git a/vendor/github.com/f5devcentral/go-bigip/ltm.go b/vendor/github.com/f5devcentral/go-bigip/ltm.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -56,7 +56,7 @@ github.com/bgentry/go-netrc/netrc
 github.com/bgentry/speakeasy
 # github.com/davecgh/go-spew v1.1.1
 github.com/davecgh/go-spew/spew
-# github.com/f5devcentral/go-bigip v0.0.0-20201014184950-5a84faa373bd
+# github.com/f5devcentral/go-bigip v0.0.0-20201023175349-07af362653f5
 github.com/f5devcentral/go-bigip
 # github.com/f5devcentral/go-bigip/f5teem v0.0.0-20201014184950-5a84faa373bd
 github.com/f5devcentral/go-bigip/f5teem

diff --git a/website/docs/r/bigip_ltm_node.html.markdown b/website/docs/r/bigip_ltm_node.html.markdown
@@ -8,6 +8,8 @@ description: |-
 
 # bigip\_ltm\_node
 
+This resource will be depreceated in future releases, use bigip_ltm_pool_attachment resource to create and manage node membership in pools.
+
 `bigip_ltm_node` Manages a node configuration
 
 For resources should be named with their "full path". The full path is the combination of the partition + name of the resource. For example /Common/my-pool.

diff --git a/website/docs/r/bigip_ltm_pool_attachment.html.markdown b/website/docs/r/bigip_ltm_pool_attachment.html.markdown
@@ -12,6 +12,12 @@ description: |-
 
 ## Example Usage
 
+
+There are two ways to use ltm_pool_attachment resource, where we can take node reference from ltm_node or we can specify node directly with ip:port/fqdn:port which will also create node and atach to pool.
+
+
+Pool attachment with node directly taking ip:port/fqdn:port
+
 ```hcl
 resource "bigip_ltm_monitor" "monitor" {
   name     = "/Common/terraform_monitor"
@@ -31,14 +37,38 @@ resource "bigip_ltm_pool" "pool" {
 resource "bigip_ltm_pool_attachment" "attach_node" {
   pool                  = bigip_ltm_pool.pool.name
   node                  = "1.1.1.1:80"
-  ratio                 = 2
-  connection_limit      = 2
-  connection_rate_limit = 2
-  priority_group        = 2
-  dynamic_ratio         = 3
 }
 
-```      
+```
+
+Pool attachment with node reference from ltm_node ( This will be depreceated in future releases )
+
+```hcl
+resource "bigip_ltm_monitor" "monitor" {
+  name     = "/Common/terraform_monitor"
+  parent   = "/Common/http"
+  send     = "GET /some/path\r\n"
+  timeout  = "999"
+  interval = "998"
+}
+resource "bigip_ltm_pool" "pool" {
+  name                = "/Common/terraform-pool"
+  load_balancing_mode = "round-robin"
+  monitors            = ["${bigip_ltm_monitor.monitor.name}"]
+  allow_snat          = "yes"
+  allow_nat           = "yes"
+}
+
+resource "bigip_ltm_node" "node" {	
+  name    = "/Common/terraform_node"	
+  address = "192.168.30.2"	
+}
+
+resource "bigip_ltm_pool_attachment" "attach_node" {
+  pool = bigip_ltm_pool.pool.name
+  node = "${bigip_ltm_node.node.name}:80"
+}
+```
 
 ## Argument Reference
 
@@ -64,4 +94,4 @@ An existing pool attachment (i.e. pool membership) can be imported into this res
 ```sh
 $ terraform import bigip_ltm_pool_attachment.node-pool-attach \
 	'{"pool": "/Common/terraform-pool", "node": "/Common/node1:80"}'
-```
+```