Skip to content

Commit 3aad430

Browse files
Merge pull request #2728 from AjKundnani/main
Fixes for AI-generated content.
2 parents 9832b16 + d03b319 commit 3aad430

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

articles/virtual-machines/generation-2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,8 @@ For more information, see [Trusted launch](trusted-launch.md).
8989
| [Azure disk encryption](../virtual-machines/disk-encryption-overview.md) | :heavy_check_mark: | :heavy_check_mark: |
9090
| [Server-side encryption](disk-encryption.md) | :heavy_check_mark: | :heavy_check_mark: |
9191

92-
9392
## Creating a Generation 2 VM
9493

95-
Alternatively, you can upgrade an existing Generation 1 VM to Generation 2 with Trusted launch. For more information, see [Upgrade existing Gen1 VMs to Gen2-Trusted launch](trusted-launch-existing-vm-gen-1.md).
96-
9794
### Azure Resource Manager Template
9895
To create a simple Windows Generation 2 VM, see [Create a Windows virtual machine from a Resource Manager template](./windows/ps-template.md)
9996
To create a simple Linux Generation 2 VM, see [How to create a Linux virtual machine with Azure Resource Manager templates](./linux/create-ssh-secured-vm-from-template.md)
@@ -160,6 +157,9 @@ You can create a Generation 2 VM from a managed image or managed disk in the sam
160157

161158
You can also create Generation 2 VMs by using virtual machine scale sets. In the Azure CLI, use Azure scale sets to create Generation 2 VMs.
162159

160+
> [!NOTE]
161+
> Alternatively, you can upgrade an existing Generation 1 VM to Generation 2 with Trusted launch. For more information, see [Upgrade existing Gen1 VMs to Gen2-Trusted launch](trusted-launch-existing-vm-gen-1.md).
162+
163163
## Frequently asked questions
164164

165165
* **Are Generation 2 VMs available in all Azure regions?**

articles/virtual-machines/trusted-launch-portal.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ms.custom:
3838
3939
## Deploy a Trusted Launch VM
4040

41-
Choose one of the following options to create a new Trusted Launch VM.
41+
Choose one of the deployment methods to create a new Trusted launch VM
4242

4343
### [Portal](#tab/portal)
4444

@@ -553,10 +553,12 @@ Make sure that you're running the latest version of the Azure CLI.
553553
-Location $location `
554554
-VM $vm
555555
```
556+
556557
---
558+
557559
## Trusted Launch built-in policies
558560
559-
To help users adopt Trusted Launch, Azure policies are available to help resource owners adopt Trusted Launch. The main objective is to help convert Generation 1 and 2 VMs that are Trusted Launch capable.
561+
To help users adopt Trusted Launch, Azure policies are available to help resource owners adopt Trusted Launch. The main objective is to help upgrade Generation 1 and 2 VMs that are Trusted launch capable.
560562
561563
The **Virtual machine should have Trusted launch enabled** single policy checks if the VM is currently enabled with Trusted Launch security configurations. The **Disks and OS supported for Trusted launch** policy checks if previously created VMs have the [capable Generation 2 OS and VM size](trusted-launch.md#virtual-machines-sizes) to deploy a Trusted Launch VM.
562564
@@ -565,6 +567,7 @@ These two policies come together to make the Trusted Launch policy initiative. T
565567
To learn more and start deploying, see [Trusted Launch built-in policies](/azure/governance/policy/samples/built-in-policies#trusted-launch).
566568
567569
---
570+
568571
## Verify or update your settings
569572
570573
For VMs created with Trusted Launch enabled, you can view the Trusted Launch configuration by going to the **Overview** page for the VM in the Azure portal. The **Properties** tab shows the status of Trusted Launch features.
@@ -579,7 +582,5 @@ If the VM is running, you receive a message that the VM will restart. Select **Y
579582
580583
## Related content
581584
582-
Learn more about [Trusted Launch](trusted-launch.md) and [boot integrity monitoring](boot-integrity-monitoring-overview.md) VMs.
583-
584-
If you have existing Gen1 VMs, you can upgrade them to Gen2-Trusted launch. For more information, see [Upgrade existing Gen1 VMs to Gen2-Trusted launch](trusted-launch-existing-vm-gen-1.md).
585-
585+
- Learn more about [Trusted Launch](trusted-launch.md) and [boot integrity monitoring](boot-integrity-monitoring-overview.md) VMs.
586+
- If you have existing VMs or VM scale sets, you can upgrade them to Gen2-Trusted launch. For more information, see [Upgrade existing Gen1 VMs to Gen2-Trusted launch](trusted-launch-existing-vm-gen-1.md), [Upgrade existing Gen2 VMs to Gen2-Trusted launch](trusted-launch-existing-vm.md), [Upgrade existing Gen1 or Gen2 VM scale sets to Gen2-Trusted launch](trusted-launch-existing-vmss.md)

articles/virtual-machines/trusted-launch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure offers Trusted Launch as a seamless way to improve the security of [Genera
2222
>
2323
> - Trusted Launch is the default state for newly created Azure Gen2 VM and scale sets. See the [Trusted Launch FAQs](trusted-launch-faq.md) if your new VM requires features that [aren't supported with Trusted launch](trusted-launch.md#unsupported-features).
2424
> - You can upgrade existing Azure Gen1 VMs to Gen2-Trusted launch to enable Secure Boot and vTPM. See [Upgrade existing Gen1 VMs to Gen2-Trusted launch](trusted-launch-existing-vm-gen-1.md).
25-
> - [Existing VM](overview.md) can have Trusted Launch enabled after being created. For more information, see [Enable Trusted Launch on existing VMs](trusted-launch-existing-vm.md).
25+
> - [Existing VM](overview.md) can have Trusted Launch enabled after being created. For more information, see [Enable Trusted Launch on existing Gen2 VMs](trusted-launch-existing-vm.md).
2626
> - Existing [virtual machine scale set](../virtual-machine-scale-sets/overview.md) can have Trusted Launch enabled after being created. For more information, see [Enable Trusted Launch on existing scale set](trusted-launch-existing-vmss.md).
2727
2828
## Benefits

0 commit comments

Comments
 (0)