Skip to content

Commit

Permalink
Fixes related to boot_disk in compute-vm module
Browse files Browse the repository at this point in the history
  • Loading branch information
@apichick
apichick committed Mar 16, 2023
1 parent 79a6e9b commit 71c8d3f
Show file tree
Hide file tree
Showing 19 changed files with 89 additions and 52 deletions.
8 changes: 5 additions & 3 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,11 @@ module "simple-vm-example" {
zone = "europe-west1-b"
name = "test"
boot_disk = {
image = "projects/debian-cloud/global/images/family/cos-97-lts"
type = "pd-balanced"
size = 10
initialize_params = {
image = "projects/debian-cloud/global/images/family/cos-97-lts"
type = "pd-balanced"
size = 10
}
}
}
```
Expand Down
8 changes: 5 additions & 3 deletions blueprints/apigee/hybrid-gke/mgmt.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ module "mgmt_server" {
}]
service_account_create = true
boot_disk = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
initialize_params = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
}
}
metadata = {
startup-script = <<EOT
Expand Down
8 changes: 5 additions & 3 deletions blueprints/cloud-operations/adfs/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ module "server" {
}
service_account_create = true
boot_disk = {
image = var.image
type = var.disk_type
size = var.disk_size
initialize_params = {
image = var.image
type = var.disk_type
size = var.disk_size
}
}
group = {
named_ports = {
Expand Down
8 changes: 5 additions & 3 deletions blueprints/cloud-operations/unmanaged-instances-healthcheck/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,11 @@ module "test-vm" {
zone = "${var.region}-b"
name = "nginx-test"
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"
type = "pd-ssd"
size = 10
}
}
metadata = {
user-data = module.cos-nginx.cloud_config
Expand Down
8 changes: 5 additions & 3 deletions blueprints/data-solutions/cloudsql-multiregion/gce.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ module "test-vm" {
service_account = module.service-account-sql.email
service_account_scopes = ["https://www.googleapis.com/auth/cloud-platform"]
boot_disk = {
image = "projects/debian-cloud/global/images/family/debian-10"
type = "pd-ssd"
size = 10
initialize_params = {
image = "projects/debian-cloud/global/images/family/debian-10"
type = "pd-ssd"
size = 10
}
}
encryption = var.service_encryption_keys != null ? {
encrypt_boot = true
Expand Down
9 changes: 5 additions & 4 deletions blueprints/data-solutions/cmek-via-centralized-kms/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,11 @@ module "vm_example" {
}
]
boot_disk = {
image = "projects/debian-cloud/global/images/family/debian-10"
type = "pd-ssd"
size = 10
encrypt_disk = true
initialize_params = {
image = "projects/debian-cloud/global/images/family/debian-10"
type = "pd-ssd"
size = 10
}
}
tags = ["ssh"]
encryption = {
Expand Down
8 changes: 5 additions & 3 deletions blueprints/data-solutions/sqlserver-alwayson/instances.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ module "nodes" {
}]
boot_disk = {
image = var.node_image
type = "pd-ssd"
size = var.boot_disk_size
initialize_params = {
image = var.node_image
type = "pd-ssd"
size = var.boot_disk_size
}
}
attached_disks = [{
Expand Down
8 changes: 5 additions & 3 deletions blueprints/gke/autopilot/mgmt.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ module "mgmt_server" {
}]
service_account_create = true
boot_disk = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
initialize_params = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
}
}
tags = ["ssh"]
}
8 changes: 5 additions & 3 deletions blueprints/gke/multi-cluster-mesh-gke-fleet-api/vm.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ module "mgmt_server" {
}]
service_account_create = true
boot_disk = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
initialize_params = {
image = var.mgmt_server_config.image
type = var.mgmt_server_config.disk_type
size = var.mgmt_server_config.disk_size
}
}
}

4 changes: 3 additions & 1 deletion blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,9 @@ module "proxy-vm" {
subnetwork = module.vpc.subnet_self_links[format("%s/%s", var.region, var.subnetwork)]
}]
boot_disk = {
image = "projects/cos-cloud/global/images/family/cos-stable"
initialize_params = {
image = "projects/cos-cloud/global/images/family/cos-stable"
}
}
create_template = true
metadata = {
Expand Down
4 changes: 3 additions & 1 deletion blueprints/networking/__need_fixing/onprem-google-access-dns/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ module "vm-onprem" {
instance_type = "f1-micro"
name = "onprem"
boot_disk = {
image = "ubuntu-os-cloud/ubuntu-1804-lts"
initialize_params = {
image = "ubuntu-os-cloud/ubuntu-1804-lts"
}
}
metadata = {
user-data = module.config-onprem.cloud_config
Expand Down
8 changes: 5 additions & 3 deletions blueprints/networking/ilb-next-hop/gateways.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ module "gw" {
instance_type = "f1-micro"

boot_disk = {
image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts",
type = "pd-ssd",
size = 10
initialize_params = {
image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2004-lts",
type = "pd-ssd",
size = 10
}
}

network_interfaces = [
Expand Down
4 changes: 3 additions & 1 deletion blueprints/networking/private-cloud-function-from-onprem/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,9 @@ module "test-vm" {
name = "${var.name}-test"
instance_type = "e2-micro"
boot_disk = {
image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2104"
initialize_params = {
image = "projects/ubuntu-os-cloud/global/images/family/ubuntu-2104"
}
}
network_interfaces = [{
network = module.vpc-onprem.self_link
Expand Down
8 changes: 5 additions & 3 deletions modules/cloud-config-container/__need_fixing/onprem/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ module "vm" {
google-logging-enabled = true
}
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"
type = "pd-ssd"
size = 10
}
}
tags = ["ssh"]
}
Expand Down
8 changes: 5 additions & 3 deletions modules/cloud-config-container/coredns/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ module "vm" {
google-logging-enabled = true
}
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"
type = "pd-ssd"
size = 10
}
}
tags = ["dns", "ssh"]
}
Expand Down
8 changes: 5 additions & 3 deletions modules/cloud-config-container/nginx-tls/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ module "vm-nginx-tls" {
google-logging-enabled = true
}
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"
type = "pd-ssd"
size = 10
}
}
tags = ["http-server", "https-server", "ssh"]
}
Expand Down
8 changes: 5 additions & 3 deletions modules/cloud-config-container/nginx/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ module "vm-nginx-tls" {
google-logging-enabled = true
}
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"
type = "pd-ssd"
size = 10
}
}
tags = ["http-server", "ssh"]
}
Expand Down
8 changes: 5 additions & 3 deletions modules/cloud-config-container/simple-nva/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ module "vm" {
google-logging-enabled = true
}
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"
type = "pd-ssd"
size = 10
}
}
tags = ["nva", "ssh"]
}
Expand Down
8 changes: 5 additions & 3 deletions modules/net-ilb/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,11 @@ module "instance-group" {
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"
type = "pd-ssd"
size = 10
}
}
tags = ["http-server", "ssh"]
metadata = {
Expand Down

0 comments on commit 71c8d3f

Please sign in to comment.