From e11e21b5251784e25f114eb7df69fdfbc310184f Mon Sep 17 00:00:00 2001 From: Yichun Ma Date: Tue, 28 Jun 2022 15:52:32 +0800 Subject: [PATCH] resolve comments --- .../{provider.tf => providers.tf} | 0 quickstart/201-confidential-os-disk/readme.md | 2 +- quickstart/201-confidential-os-disk/variables.tf | 1 - quickstart/201-confidential-vm/main.tf | 3 +++ .../201-confidential-vm/{provider.tf => providers.tf} | 0 quickstart/201-confidential-vm/readme.md | 2 +- quickstart/201-confidential-vm/variables.tf | 11 +++++------ quickstart/201-confidential-vmss/main.tf | 3 +++ .../{provider.tf => providers.tf} | 0 quickstart/201-confidential-vmss/readme.md | 2 +- quickstart/201-confidential-vmss/variables.tf | 1 - 11 files changed, 14 insertions(+), 11 deletions(-) rename quickstart/201-confidential-os-disk/{provider.tf => providers.tf} (100%) rename quickstart/201-confidential-vm/{provider.tf => providers.tf} (100%) rename quickstart/201-confidential-vmss/{provider.tf => providers.tf} (100%) diff --git a/quickstart/201-confidential-os-disk/provider.tf b/quickstart/201-confidential-os-disk/providers.tf similarity index 100% rename from quickstart/201-confidential-os-disk/provider.tf rename to quickstart/201-confidential-os-disk/providers.tf diff --git a/quickstart/201-confidential-os-disk/readme.md b/quickstart/201-confidential-os-disk/readme.md index b5cbba57..6b89fb3d 100644 --- a/quickstart/201-confidential-os-disk/readme.md +++ b/quickstart/201-confidential-os-disk/readme.md @@ -12,7 +12,7 @@ This template deploys an Azure confidential os disk encrypted by platform key. | Name | Description | |-|-| | `location` | (Required) Azure Region in which to deploy these resources.| -| `name_prefix` | (Optional) Prefix of the resource name. Value defaults to: tftest| +| `name_prefix` | (Required) Prefix of the resource name.| ## Example diff --git a/quickstart/201-confidential-os-disk/variables.tf b/quickstart/201-confidential-os-disk/variables.tf index 37a61bc2..d0d1cc7c 100644 --- a/quickstart/201-confidential-os-disk/variables.tf +++ b/quickstart/201-confidential-os-disk/variables.tf @@ -5,6 +5,5 @@ variable "location" { variable "name_prefix" { type = string - default = "tftest" description = "Prefix of the resource name" } diff --git a/quickstart/201-confidential-vm/main.tf b/quickstart/201-confidential-vm/main.tf index c590a84a..71ffe5da 100644 --- a/quickstart/201-confidential-vm/main.tf +++ b/quickstart/201-confidential-vm/main.tf @@ -111,7 +111,10 @@ resource "azurerm_linux_virtual_machine" "test" { name = "${var.name_prefix}-vm" resource_group_name = azurerm_resource_group.example.name location = azurerm_resource_group.example.location + + # Available sizes for Confidential VM can be found at: https://docs.microsoft.com/azure/confidential-computing/confidential-vm-overview size = "Standard_DC2as_v5" + admin_username = "azureuser" network_interface_ids = [ azurerm_network_interface.example.id, diff --git a/quickstart/201-confidential-vm/provider.tf b/quickstart/201-confidential-vm/providers.tf similarity index 100% rename from quickstart/201-confidential-vm/provider.tf rename to quickstart/201-confidential-vm/providers.tf diff --git a/quickstart/201-confidential-vm/readme.md b/quickstart/201-confidential-vm/readme.md index fb7cb1eb..347abd3b 100644 --- a/quickstart/201-confidential-vm/readme.md +++ b/quickstart/201-confidential-vm/readme.md @@ -19,8 +19,8 @@ This template deploys an Azure confidential virtual machine with disk encrypted | Name | Description | |-|-| | `location` | (Required) Azure Region in which to deploy these resources.| +| `name_prefix` | (Required) Prefix of the resource name.| | `vm_public_key` | (Required) Public key of the Virtual Machine.| -| `name_prefix` | (Optional) Prefix of the resource name. Value defaults to: tftest| ## Example diff --git a/quickstart/201-confidential-vm/variables.tf b/quickstart/201-confidential-vm/variables.tf index c3125425..b5e9aa6e 100644 --- a/quickstart/201-confidential-vm/variables.tf +++ b/quickstart/201-confidential-vm/variables.tf @@ -3,13 +3,12 @@ variable "location" { description = "Location where resources will be created" } +variable "name_prefix" { + type = string + description = "Prefix of the resource name" +} + variable "vm_public_key" { type = string description = "Public key of the Virtual Machine" } - -variable "name_prefix" { - type = string - default = "tftest" - description = "Prefix of the resource name" -} diff --git a/quickstart/201-confidential-vmss/main.tf b/quickstart/201-confidential-vmss/main.tf index 78d00637..6ced7db2 100644 --- a/quickstart/201-confidential-vmss/main.tf +++ b/quickstart/201-confidential-vmss/main.tf @@ -21,7 +21,10 @@ resource "azurerm_windows_virtual_machine_scale_set" "example" { name = "${var.name_prefix}-vmss" resource_group_name = azurerm_resource_group.example.name location = azurerm_resource_group.example.location + + # Available skus for Confidential VMSS can be found at: https://docs.microsoft.com/azure/confidential-computing/confidential-vm-overview sku = "Standard_DC2as_v5" + instances = 2 admin_username = "adminuser" admin_password = var.admin_password diff --git a/quickstart/201-confidential-vmss/provider.tf b/quickstart/201-confidential-vmss/providers.tf similarity index 100% rename from quickstart/201-confidential-vmss/provider.tf rename to quickstart/201-confidential-vmss/providers.tf diff --git a/quickstart/201-confidential-vmss/readme.md b/quickstart/201-confidential-vmss/readme.md index d1f2032b..66187ac3 100644 --- a/quickstart/201-confidential-vmss/readme.md +++ b/quickstart/201-confidential-vmss/readme.md @@ -15,7 +15,7 @@ This template deploys an Azure confidential virtual machine scale set with guest |-|-| | `admin_password` | (Required) Admin password of the virtual machine scale set.| | `location` | (Required) Azure Region in which to deploy these resources.| -| `name_prefix` | (Optional) Prefix of the resource name. Value defaults to: tftest| +| `name_prefix` | (Required) Prefix of the resource name.| ## Example diff --git a/quickstart/201-confidential-vmss/variables.tf b/quickstart/201-confidential-vmss/variables.tf index 897b03aa..762681e0 100644 --- a/quickstart/201-confidential-vmss/variables.tf +++ b/quickstart/201-confidential-vmss/variables.tf @@ -11,6 +11,5 @@ variable "location" { variable "name_prefix" { type = string - default = "tftest" description = "Prefix of the resource name" }