diff --git a/terragrunt/accounts/dev-desktops-prod/europe-west1/terragrunt.hcl b/terragrunt/accounts/dev-desktops-prod/europe-west1/terragrunt.hcl index f28ce48d6..faac3ca9f 100644 --- a/terragrunt/accounts/dev-desktops-prod/europe-west1/terragrunt.hcl +++ b/terragrunt/accounts/dev-desktops-prod/europe-west1/terragrunt.hcl @@ -15,6 +15,7 @@ inputs = { "dev-desktop-eu-2" = { # vCPUs: 32, RAM: 64 GiB, AMD Milan. instance_type = "c2d-highcpu-32" + storage_type = "pd-balanced" storage = 2000 } } diff --git a/terragrunt/accounts/dev-desktops-prod/us-central1/terragrunt.hcl b/terragrunt/accounts/dev-desktops-prod/us-central1/terragrunt.hcl index b5b323ce4..e09516f33 100644 --- a/terragrunt/accounts/dev-desktops-prod/us-central1/terragrunt.hcl +++ b/terragrunt/accounts/dev-desktops-prod/us-central1/terragrunt.hcl @@ -10,11 +10,12 @@ include { inputs = { project = "dev-desktops-prod" region = "us-central1" - zone = "us-central1-a" + zone = "us-central1-b" instances = { "dev-desktop-us-2" = { # vCPUs: 32, RAM: 64 GiB, AMD Milan. - instance_type = "c2d-highcpu-32" + instance_type = "c4d-highcpu-32" + storage_type = "hyperdisk-balanced" storage = 2000 } } diff --git a/terragrunt/modules/dev-desktops-gcp/_terraform.tf b/terragrunt/modules/dev-desktops-gcp/_terraform.tf index 423bb84ba..a91e58320 100644 --- a/terragrunt/modules/dev-desktops-gcp/_terraform.tf +++ b/terragrunt/modules/dev-desktops-gcp/_terraform.tf @@ -46,6 +46,7 @@ variable "instances" { description = "A map of instances with their machine types and disk sizes" type = map(object({ instance_type = string + storage_type = string storage = number })) } diff --git a/terragrunt/modules/dev-desktops-gcp/instances.tf b/terragrunt/modules/dev-desktops-gcp/instances.tf index 0fc75295e..28b51ab4e 100644 --- a/terragrunt/modules/dev-desktops-gcp/instances.tf +++ b/terragrunt/modules/dev-desktops-gcp/instances.tf @@ -43,7 +43,7 @@ resource "google_compute_instance" "instance" { # The default choice in the Google Cloud Console. # It uses SSDs but limits the performance to provide a # more economical price point than `pd-ssd`. - type = "pd-balanced" + type = each.value.storage_type } } @@ -66,4 +66,10 @@ resource "google_compute_instance" "instance" { metadata = { "ssh-keys" = "ubuntu:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdGoRV9XPamZwqCMr4uk1oHWPnknzwOOSjuRBnu++WRkn7TtCM4ndDfqtKnvzlX5mzPhdvO1KKx1K8TiJ3wiq7WS4AFLGKQmPHWjg8qxGW7x4S8DHrb4ctmaujZ1+XCNSK3nsCl1lLW8DOrRlKbfeHIAllbMBZxIRmQ+XICVvhKAmSmxzTmYC8tBqvqQprG/uIuKonjLxL/ljtBxXBNECXl/JFCYG0AsB0aiuiMVeHLVzMiEppQ7YP/5Ml1Rpmn6h0dDzFtoD7xenroS98BIQF5kQWhakHbtWcNMz7DVFghWgi9wYr0gtoIshhqWYorC4yJq6HGXd0qdNHuLWNz39h" } + + lifecycle { + ignore_changes = [ + boot_disk[0].initialize_params[0].image + ] + } }