Allow using existing boot disk in compute-vm module (#1241)

* allow using existing boot disk in compute-vm module * allow setting initialize params to null * tests * fast * blueprints
GoogleCloudPlatform · Mar 12, 2023 · 112d9a8 · 112d9a8
1 parent 6aa0fde
commit 112d9a8
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 104 deletions.
diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/onprem.tf b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/onprem.tf
@@ -83,9 +83,9 @@ module "instance_template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {

diff --git a/blueprints/networking/filtering-proxy-psc/consumer.tf b/blueprints/networking/filtering-proxy-psc/consumer.tf
@@ -48,19 +48,14 @@ module "test-vm-consumer" {
     nat        = false
     addresses  = null
   }]
-  boot_disk = {
-    image = "debian-cloud/debian-10"
-    type  = "pd-standard"
-    size  = 10
-  }
   service_account_create = true
   metadata = {
     startup-script = templatefile("${path.module}/startup.sh", { proxy_url = "http://proxy.internal:3128" })
   }
 }
 
 ###############################################################################
-#                                 PSC Consuner                                #
+#                                 PSC Consumer                                #
 ###############################################################################
 
 resource "google_compute_address" "psc_endpoint_address" {

diff --git a/blueprints/networking/filtering-proxy-psc/main.tf b/blueprints/networking/filtering-proxy-psc/main.tf
@@ -147,7 +147,9 @@ module "squid-vm" {
     subnetwork = module.vpc.subnet_self_links["${var.region}/proxy"]
   }]
   boot_disk = {
-    image = "cos-cloud/cos-stable"
+    initialize_params = {
+      image = "cos-cloud/cos-stable"
+    }
   }
   service_account        = module.service-account-squid.email
   service_account_scopes = ["https://www.googleapis.com/auth/cloud-platform"]

diff --git a/blueprints/networking/filtering-proxy/main.tf b/blueprints/networking/filtering-proxy/main.tf
@@ -156,7 +156,9 @@ module "squid-vm" {
     subnetwork = module.vpc.subnet_self_links["${var.region}/proxy"]
   }]
   boot_disk = {
-    image = "cos-cloud/cos-stable"
+    initialize_params = {
+      image = "cos-cloud/cos-stable"
+    }
   }
   service_account        = module.service-account-squid.email
   service_account_scopes = ["https://www.googleapis.com/auth/cloud-platform"]
@@ -261,10 +263,5 @@ module "test-vm" {
     nat        = false
     addresses  = null
   }]
-  boot_disk = {
-    image = "debian-cloud/debian-10"
-    type  = "pd-standard"
-    size  = 10
-  }
   service_account_create = true
 }
diff --git a/blueprints/networking/glb-and-armor/main.tf b/blueprints/networking/glb-and-armor/main.tf
@@ -92,9 +92,6 @@ module "instance_template_ew1" {
     network    = module.vpc.self_link
     subnetwork = module.vpc.subnet_self_links["europe-west1/subnet-ew1"]
   }]
-  boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-  }
   metadata = {
     startup-script-url = "gs://cloud-training/gcpnet/httplb/startup.sh"
   }
@@ -113,9 +110,6 @@ module "instance_template_ue1" {
     network    = module.vpc.self_link
     subnetwork = module.vpc.subnet_self_links["us-east1/subnet-ue1"]
   }]
-  boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-  }
   metadata = {
     startup-script-url = "gs://cloud-training/gcpnet/httplb/startup.sh"
   }
@@ -136,9 +130,6 @@ module "vm_siege" {
     subnetwork = module.vpc.subnet_self_links["us-west1/subnet-uw1"]
     nat        = true
   }]
-  boot_disk = {
-    image = "projects/debian-cloud/global/images/family/debian-11"
-  }
   metadata = {
     startup-script = <<EOT
     #!/bin/bash

diff --git a/fast/stages/2-networking-c-nva/nva.tf b/fast/stages/2-networking-c-nva/nva.tf
@@ -81,9 +81,9 @@ module "nva-template" {
     }
   ]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    size  = 10
-    type  = "pd-balanced"
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   options = {
     allow_stopping_for_update = true

diff --git a/modules/compute-mig/README.md b/modules/compute-mig/README.md
@@ -28,9 +28,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
@@ -71,9 +71,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
@@ -122,9 +122,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
@@ -174,9 +174,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
@@ -225,9 +225,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   create_template = true
   metadata = {
@@ -282,9 +282,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   attached_disks = [{
     name        = "repd-1"
@@ -352,9 +352,9 @@ module "nginx-template" {
     addresses  = null
   }]
   boot_disk = {
-    image = "projects/cos-cloud/global/images/family/cos-stable"
-    type  = "pd-ssd"
-    size  = 10
+    initialize_params = {
+      image = "projects/cos-cloud/global/images/family/cos-stable"
+    }
   }
   attached_disks = [{
     name        = "repd-1"