Allow node role to be set during node registration (#110)

* Allow node role to be set during node registration * Allow node role to be set during node registration * fix typo
netascode · Jul 12, 2024 · 732c6a4 · 732c6a4
1 parent 5d9cf70
commit 732c6a4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/aci_node_policies.tf b/aci_node_policies.tf
@@ -41,6 +41,7 @@ module "aci_node_registration" {
   name           = each.value.name
   node_id        = each.value.id
   pod_id         = try(each.value.pod, local.defaults.apic.node_policies.nodes.pod)
+  role           = each.value.role
   serial_number  = each.value.serial_number
   type           = try(each.value.type, "unspecified")
   remote_pool_id = try(each.value.remote_pool_id, 0)

diff --git a/modules/terraform-aci-node-registration/README.md b/modules/terraform-aci-node-registration/README.md
@@ -16,6 +16,7 @@ module "aci_node_registration" {
   name           = "LEAF105"
   node_id        = 105
   pod_id         = 2
+  role           = "leaf"
   serial_number  = "ABCDEFGHIJKLMN"
   type           = "remote-leaf-wan"
   remote_pool_id = 2
@@ -42,6 +43,7 @@ module "aci_node_registration" {
 | <a name="input_name"></a> [name](#input\_name) | Node name. | `string` | n/a | yes |
 | <a name="input_node_id"></a> [node\_id](#input\_node\_id) | Node ID. Minimum value: 1. Maximum value: 4000. | `number` | n/a | yes |
 | <a name="input_pod_id"></a> [pod\_id](#input\_pod\_id) | Pod ID. Minimum value: 1. Maximum value: 255. | `number` | `1` | no |
+| <a name="input_role"></a> [role](#input\_role) | Node role. Choices: `leaf`, `spine`. | `string` | `"unspecified"` | no |
 | <a name="input_serial_number"></a> [serial\_number](#input\_serial\_number) | Serial number. | `string` | n/a | yes |
 | <a name="input_type"></a> [type](#input\_type) | Node type. Choices: `remote-leaf-wan`, `virtual`, `tier-2-leaf`, `unspecified`. | `string` | `"unspecified"` | no |
 | <a name="input_remote_pool_id"></a> [remote\_pool\_id](#input\_remote\_pool\_id) | Remote Pool ID. Minimum value: 0. Maximum value: 255 | `number` | `0` | no |

diff --git a/modules/terraform-aci-node-registration/examples/complete/README.md b/modules/terraform-aci-node-registration/examples/complete/README.md
@@ -19,6 +19,7 @@ module "aci_node_registration" {
   name           = "LEAF105"
   node_id        = 105
   pod_id         = 2
+  role           = "leaf"
   serial_number  = "ABCDEFGHIJKLMN"
   type           = "remote-leaf-wan"
   remote_pool_id = 2

diff --git a/modules/terraform-aci-node-registration/examples/complete/main.tf b/modules/terraform-aci-node-registration/examples/complete/main.tf
@@ -5,6 +5,7 @@ module "aci_node_registration" {
   name           = "LEAF105"
   node_id        = 105
   pod_id         = 2
+  role           = "leaf"
   serial_number  = "ABCDEFGHIJKLMN"
   type           = "remote-leaf-wan"
   remote_pool_id = 2

diff --git a/modules/terraform-aci-node-registration/main.tf b/modules/terraform-aci-node-registration/main.tf
@@ -5,6 +5,7 @@ resource "aci_rest_managed" "fabricNodeIdentP" {
     name      = var.name
     serial    = var.serial_number
     nodeId    = var.node_id
+    role      = var.role
     nodeType  = var.type
     podId     = var.pod_id
     extPoolId = var.type == "remote-leaf-wan" ? var.remote_pool_id : null

diff --git a/modules/terraform-aci-node-registration/variables.tf b/modules/terraform-aci-node-registration/variables.tf
@@ -29,6 +29,17 @@ variable "pod_id" {
   }
 }
 
+variable "role" {
+  description = "Node role. Choices: `leaf`, `spine`."
+  type        = string
+  default     = "unspecified"
+
+  validation {
+    condition     = contains(["leaf", "spine"], var.role)
+    error_message = "Allowed values: `leaf` or `spine`."
+  }
+}
+
 variable "serial_number" {
   description = "Serial number."
   type        = string