Merge pull request GoogleCloudPlatform#4403 from annuay-google/annuay/fix-additional-disks-login

Fix additional disks for login nodes

Author: annuay-google

community/modules/scheduler/schedmd-slurm-gcp-v6-login/README.md

@@ -80,7 +80,7 @@ No resources.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_additional_disks"></a> [additional\_disks](#input\_additional\_disks) | List of maps of disks. | <pre>list(object({<br/>    disk_name                  = string<br/>    device_name                = string<br/>    disk_type                  = string<br/>    disk_size_gb               = number<br/>    disk_labels                = map(string)<br/>    auto_delete                = bool<br/>    boot                       = bool<br/>    disk_resource_manager_tags = map(string)<br/>  }))</pre> | `[]` | no |
+| <a name="input_additional_disks"></a> [additional\_disks](#input\_additional\_disks) | List of maps of disks. | <pre>list(object({<br/>    disk_name                  = optional(string)<br/>    device_name                = optional(string)<br/>    disk_size_gb               = optional(number)<br/>    disk_type                  = optional(string)<br/>    disk_labels                = optional(map(string))<br/>    auto_delete                = optional(bool)<br/>    boot                       = optional(bool)<br/>    disk_resource_manager_tags = optional(map(string))<br/>  }))</pre> | `[]` | no |
 | <a name="input_additional_networks"></a> [additional\_networks](#input\_additional\_networks) | Additional network interface details for GCE, if any. | <pre>list(object({<br/>    access_config = optional(list(object({<br/>      nat_ip       = string<br/>      network_tier = string<br/>    })), [])<br/>    alias_ip_range = optional(list(object({<br/>      ip_cidr_range         = string<br/>      subnetwork_range_name = string<br/>    })), [])<br/>    ipv6_access_config = optional(list(object({<br/>      network_tier = string<br/>    })), [])<br/>    network            = optional(string)<br/>    network_ip         = optional(string, "")<br/>    nic_type           = optional(string)<br/>    queue_count        = optional(number)<br/>    stack_type         = optional(string)<br/>    subnetwork         = optional(string)<br/>    subnetwork_project = optional(string)<br/>  }))</pre> | `[]` | no |
 | <a name="input_advanced_machine_features"></a> [advanced\_machine\_features](#input\_advanced\_machine\_features) | See https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance_template#nested_advanced_machine_features | <pre>object({<br/>    enable_nested_virtualization = optional(bool)<br/>    threads_per_core             = optional(number)<br/>    turbo_mode                   = optional(string)<br/>    visible_core_count           = optional(number)<br/>    performance_monitoring_unit  = optional(string)<br/>    enable_uefi_networking       = optional(bool)<br/>  })</pre> | <pre>{<br/>  "threads_per_core": 1<br/>}</pre> | no |
 | <a name="input_allow_automatic_updates"></a> [allow\_automatic\_updates](#input\_allow\_automatic\_updates) | If false, disables automatic system package updates on the created instances.  This feature is<br/>only available on supported images (or images derived from them).  For more details, see<br/>https://cloud.google.com/compute/docs/instances/create-hpc-vm#disable_automatic_updates | `bool` | `true` | no |

community/modules/scheduler/schedmd-slurm-gcp-v6-login/main.tf

@@ -43,7 +43,7 @@ locals {
       disk_labels                = merge(ad.disk_labels, local.labels)
       auto_delete                = ad.auto_delete
       boot                       = ad.boot
-      disk_resource_manager_tags = ad.var.disk_resource_manager_tags
+      disk_resource_manager_tags = ad.disk_resource_manager_tags
     }
   ]
 

community/modules/scheduler/schedmd-slurm-gcp-v6-login/variables.tf

@@ -93,14 +93,14 @@ variable "disk_resource_manager_tags" {
 
 variable "additional_disks" {
   type = list(object({
-    disk_name                  = string
-    device_name                = string
-    disk_type                  = string
-    disk_size_gb               = number
-    disk_labels                = map(string)
-    auto_delete                = bool
-    boot                       = bool
-    disk_resource_manager_tags = map(string)
+    disk_name                  = optional(string)
+    device_name                = optional(string)
+    disk_size_gb               = optional(number)
+    disk_type                  = optional(string)
+    disk_labels                = optional(map(string))
+    auto_delete                = optional(bool)
+    boot                       = optional(bool)
+    disk_resource_manager_tags = optional(map(string))
   }))
   description = "List of maps of disks."
   default     = []