Adding A4X and Future NPI Support to JBVM

modules/compute/vm-instance/README.md

@@ -230,7 +230,7 @@ limitations under the License.
 | <a name="input_network_self_link"></a> [network\_self\_link](#input\_network\_self\_link) | The self link of the network to attach the VM. Can use "default" for the default network. | `string` | `null` | no |
 | <a name="input_network_storage"></a> [network\_storage](#input\_network\_storage) | An array of network attached storage mounts to be configured. | <pre>list(object({<br/>    server_ip             = string,<br/>    remote_mount          = string,<br/>    local_mount           = string,<br/>    fs_type               = string,<br/>    mount_options         = string,<br/>    client_install_runner = map(string)<br/>    mount_runner          = map(string)<br/>  }))</pre> | `[]` | no |
 | <a name="input_on_host_maintenance"></a> [on\_host\_maintenance](#input\_on\_host\_maintenance) | Describes maintenance behavior for the instance. If left blank this will default to `MIGRATE` except for when `placement_policy`, spot provisioning, or GPUs require it to be `TERMINATE` | `string` | `null` | no |
-| <a name="input_placement_policy"></a> [placement\_policy](#input\_placement\_policy) | Control where your VM instances are physically located relative to each other within a zone.<br/>See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_resource_policy#nested_group_placement_policy | `any` | `null` | no |
+| <a name="input_placement_policy"></a> [placement\_policy](#input\_placement\_policy) | Control where your VM instances are physically located relative to each other within a zone.<br/>See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_resource_policy#nested_group_placement_policy<br/><br/>Supported fields:<br/> vm_count (number) </br> availability_domain_count (number)</br> collocation (string), max_distance (number)</br> gpu_topology (string). | `any` | `null` | no | 
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Project in which the HPC deployment will be created | `string` | n/a | yes |
 | <a name="input_provisioning_model"></a> [provisioning\_model](#input\_provisioning\_model) | Provisioning model for cloud instance. | `string` | `null` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region to deploy to | `string` | n/a | yes |

modules/compute/vm-instance/main.tf

@@ -136,6 +136,7 @@ resource "google_compute_resource_policy" "placement_policy" {
     availability_domain_count = try(var.placement_policy.availability_domain_count, null)
     collocation               = try(var.placement_policy.collocation, null)
     max_distance              = try(var.placement_policy.max_distance, null)
+    gpu_topology              = try(var.placement_policy.gpu_topology, null)
   }
 }
 
@@ -145,6 +146,7 @@ resource "null_resource" "replace_vm_trigger_from_placement" {
     availability_domain_count = try(tostring(var.placement_policy.availability_domain_count), "")
     max_distance              = try(tostring(var.placement_policy.max_distance), "")
     collocation               = try(var.placement_policy.collocation, "")
+    gpu_topology              = try(var.placement_policy.gpu_topology, "") 
   }
 }
 

modules/compute/vm-instance/variables.tf

@@ -314,25 +314,30 @@ variable "placement_policy" {
   Control where your VM instances are physically located relative to each other within a zone.
   See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_resource_policy#nested_group_placement_policy
   EOT
-
-  type    = any # It's a workaround of lack of `optional` in Terraform 1.2
+  type = object({
+    vm_count                = optional(number)
+    availability_domain_count = optional(number)
+    collocation             = optional(string)
+    max_distance            = optional(number)
+    gpu_topology            = optional(string)
+  })  
   default = null
   validation {
     condition     = var.placement_policy == null ? true : try(keys(var.placement_policy), null) != null
     error_message = <<-EOT
     The var.placement_policy should be either unset/null or be a map/object with
-    fields: vm_count (number), availability_domain_count (number), collocation (string), max_distance (number).
+    fields: vm_count (number), availability_domain_count (number), collocation (string), max_distance (number), gpu_topology (string).
     EOT
   }
 
   validation {
     condition = alltrue([
       for k in try(keys(var.placement_policy), []) : contains([
-      "vm_count", "availability_domain_count", "collocation", "max_distance"], k)
+      "vm_count", "availability_domain_count", "collocation", "max_distance", "gpu_topology"], k)
     ])
     error_message = <<-EOT
     The supported fields for var.placement_policy are:
-    vm_count (number), availability_domain_count (number), collocation (string), max_distance (number).
+    vm_count (number), availability_domain_count (number), collocation (string), max_distance (number), gpu_topology (string).
     EOT
   }
 }