updating creation of vm boot disk and coupling it with VM instance.

Author: arpit974

community/modules/remote-desktop/chrome-remote-desktop/README.md

@@ -75,7 +75,6 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_add_deployment_name_before_prefix"></a> [add\_deployment\_name\_before\_prefix](#input\_add\_deployment\_name\_before\_prefix) | If true, the names of VMs and disks will always be prefixed with `deployment_name` to enable uniqueness across deployments.<br/>See `name_prefix` for further details on resource naming behavior. | `bool` | `false` | no |
-| <a name="input_auto_delete_boot_disk"></a> [auto\_delete\_boot\_disk](#input\_auto\_delete\_boot\_disk) | Controls if boot disk should be auto-deleted when instance is deleted. | `bool` | `true` | no |
 | <a name="input_bandwidth_tier"></a> [bandwidth\_tier](#input\_bandwidth\_tier) | Tier 1 bandwidth increases the maximum egress bandwidth for VMs.<br/>  Using the `tier_1_enabled` setting will enable both gVNIC and TIER\_1 higher bandwidth networking.<br/>  Using the `gvnic_enabled` setting will only enable gVNIC and will not enable TIER\_1.<br/>  Note that TIER\_1 only works with specific machine families & shapes and must be using an image th<br/>at supports gVNIC. See [official docs](https://cloud.google.com/compute/docs/networking/configure-v<br/>m-with-high-bandwidth-configuration) for more details. | `string` | `"not_enabled"` | no |
 | <a name="input_deployment_name"></a> [deployment\_name](#input\_deployment\_name) | Cluster Toolkit deployment name. Cloud resource names will include this value. | `string` | n/a | yes |
 | <a name="input_disk_size_gb"></a> [disk\_size\_gb](#input\_disk\_size\_gb) | Size of disk for instances. | `number` | `200` | no |

community/modules/remote-desktop/chrome-remote-desktop/main.tf

@@ -90,10 +90,9 @@ module "instances" {
   startup_script        = module.client_startup_script.startup_script
   enable_oslogin        = var.enable_oslogin
 
-  instance_image        = var.instance_image
-  disk_size_gb          = var.disk_size_gb
-  disk_type             = var.disk_type
-  auto_delete_boot_disk = var.auto_delete_boot_disk
+  instance_image = var.instance_image
+  disk_size_gb   = var.disk_size_gb
+  disk_type      = var.disk_type
 
   disable_public_ips   = !var.enable_public_ips
   network_self_link    = var.network_self_link

community/modules/remote-desktop/chrome-remote-desktop/variables.tf

@@ -87,12 +87,6 @@ variable "disk_type" {
   default     = "pd-balanced"
 }
 
-variable "auto_delete_boot_disk" {
-  description = "Controls if boot disk should be auto-deleted when instance is deleted."
-  type        = bool
-  default     = true
-}
-
 variable "name_prefix" {
   description = <<-EOT
     An optional name for all VM and disk resources.

modules/compute/vm-instance/README.md

@@ -196,7 +196,6 @@ limitations under the License.
 | [google-beta_google_compute_resource_policy.placement_policy](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_compute_resource_policy) | resource |
 | [google_compute_address.compute_ip](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_address) | resource |
 | [google_compute_disk.additional_disks](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_disk) | resource |
-| [google_compute_disk.boot_disk](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_disk) | resource |
 | [null_resource.image](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
 | [null_resource.replace_vm_trigger_from_placement](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
 | [google_compute_image.compute_image](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/compute_image) | data source |
@@ -209,7 +208,6 @@ limitations under the License.
 | <a name="input_additional_persistent_disks"></a> [additional\_persistent\_disks](#input\_additional\_persistent\_disks) | Configurations of additional disks to be included on the partition nodes. | <pre>object({<br/>    count = optional(number, 0)<br/>    type  = optional(string, "pd-balanced")<br/>    size  = optional(number, 200)<br/>  })</pre> | `{}` | no |
 | <a name="input_allocate_ip"></a> [allocate\_ip](#input\_allocate\_ip) | If not null, allocate IPs with the given configuration. See details at<br/>https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_address | <pre>object({<br/>    address_type = optional(string, "INTERNAL")<br/>    purpose      = optional(string),<br/>    network_tier = optional(string),<br/>    ip_version   = optional(string, "IPV4"),<br/>  })</pre> | `null` | 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 |
-| <a name="input_auto_delete_boot_disk"></a> [auto\_delete\_boot\_disk](#input\_auto\_delete\_boot\_disk) | Controls if boot disk should be auto-deleted when instance is deleted. | `bool` | `true` | no |
 | <a name="input_automatic_restart"></a> [automatic\_restart](#input\_automatic\_restart) | Specifies if the instance should be restarted if it was terminated by Compute Engine (not a user). | `bool` | `null` | no |
 | <a name="input_bandwidth_tier"></a> [bandwidth\_tier](#input\_bandwidth\_tier) | Tier 1 bandwidth increases the maximum egress bandwidth for VMs.<br/>  Using the `tier_1_enabled` setting will enable both gVNIC and TIER\_1 higher bandwidth networking.<br/>  Using the `gvnic_enabled` setting will only enable gVNIC and will not enable TIER\_1.<br/>  Note that TIER\_1 only works with specific machine families & shapes and must be using an image that supports gVNIC. See [official docs](https://cloud.google.com/compute/docs/networking/configure-vm-with-high-bandwidth-configuration) for more details. | `string` | `"not_enabled"` | no |
 | <a name="input_deployment_name"></a> [deployment\_name](#input\_deployment\_name) | Name of the deployment, will optionally be used name resources according to `name_prefix` | `string` | n/a | yes |

modules/compute/vm-instance/main.tf

@@ -112,27 +112,6 @@ resource "null_resource" "image" {
   }
 }
 
-resource "google_compute_disk" "boot_disk" {
-  project = var.project_id
-
-  count = var.instance_count
-
-  name   = "${local.resource_prefix}-boot-disk-${count.index}"
-  image  = data.google_compute_image.compute_image.self_link
-  type   = var.disk_type
-  size   = var.disk_size_gb
-  labels = local.labels
-  zone   = var.zone
-
-  lifecycle {
-    replace_triggered_by = [null_resource.image]
-
-    ignore_changes = [
-      image
-    ]
-  }
-}
-
 resource "google_compute_disk" "additional_disks" {
   project = var.project_id
 
@@ -205,9 +184,15 @@ resource "google_compute_instance" "compute_vm" {
   labels = local.labels
 
   boot_disk {
-    source      = google_compute_disk.boot_disk[count.index].self_link
-    device_name = google_compute_disk.boot_disk[count.index].name
-    auto_delete = var.auto_delete_boot_disk
+    initialize_params {
+      image  = data.google_compute_image.compute_image.self_link
+      size   = var.disk_size_gb
+      type   = var.disk_type
+      labels = local.labels
+    }
+
+    device_name = "${local.resource_prefix}-boot-disk-${count.index}"
+    auto_delete = true
   }
 
   dynamic "attached_disk" {

modules/compute/vm-instance/variables.tf

@@ -56,12 +56,6 @@ variable "disk_type" {
   default     = "pd-standard"
 }
 
-variable "auto_delete_boot_disk" {
-  description = "Controls if boot disk should be auto-deleted when instance is deleted."
-  type        = bool
-  default     = true
-}
-
 variable "local_ssd_count" {
   description = "The number of local SSDs to attach to each VM. See https://cloud.google.com/compute/docs/disks/local-ssd."
   type        = number