Skip to content

Commit 4274232

Browse files
authored
Merge pull request #260627 from simranparkhe/tdx-public-preview
changing regional availability
2 parents 0c7a049 + ee532ed commit 4274232

8 files changed

+15
-45
lines changed

articles/confidential-computing/.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/confidential-computing/quick-create-confidential-vm-azure-cli-amd.md",
3030
"redirect_url": "/azure/confidential-computing/quick-create-confidential-vm-azure-cli",
3131
"redirect_document_id": true
32+
},
33+
{
34+
"source_path_from_root": "/articles/confidential-computing/tdx-confidential-vm-overview.md",
35+
"redirect_url": "/azure/virtual-machines/dcesv5-dcedsv5-series",
36+
"redirect_document_id": true
3237
}
3338
]
3439
}

articles/confidential-computing/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
items:
3636
- name: Confidential virtual machines
3737
items:
38-
- name: About confidential VMs
38+
- name: Azure Confidential VM options
3939
href: confidential-vm-overview.md
4040
- name: FAQ for confidential VMs
4141
href: confidential-vm-faq.yml

articles/confidential-computing/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ landingContent:
6666
linkLists:
6767
- linkListType: overview
6868
links:
69-
- text: About confidential VMs
69+
- text: Azure Confidential VM options
7070
url: confidential-vm-overview.md
7171
- text: Confidential VM solutions
7272
url: virtual-machine-solutions.md

articles/confidential-computing/quick-create-confidential-vm-azure-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Azure Cloud Shell is a free interactive shell that you can use to run the steps
2727

2828
To open the Cloud Shell, just select **Try it** from the upper right corner of a code block. You can also open Cloud Shell in a separate browser tab by going to [https://shell.azure.com/bash](https://shell.azure.com/bash). Select **Copy** to copy the blocks of code, paste it into the Cloud Shell, and select **Enter** to run it.
2929

30-
If you prefer to install and use the CLI locally, this quickstart requires Azure CLI version 2.0.30 or later. Run `az--version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
30+
If you prefer to install and use the CLI locally, this quickstart requires Azure CLI version 2.38.0 or later. Run `az--version` to find the version. If you need to install or upgrade, see [Install Azure CLI](/cli/azure/install-azure-cli).
3131

3232
### Create a resource group
3333

@@ -96,7 +96,7 @@ For this step you need to be a Global Admin or you need to have the User Access
9696
az keyvault create -n keyVaultName -g myResourceGroup --enabled-for-disk-encryption true --sku premium --enable-purge-protection true
9797
```
9898
3. Give `Confidential VM Orchestrator` permissions to `get` and `release` the key vault.
99-
```azurecli
99+
```Powershell
100100
$cvmAgent = az ad sp show --id "bf7b6499-ff71-4aa2-97a4-f372087be7f0" | Out-String | ConvertFrom-Json
101101
az keyvault set-policy --name $KeyVault --object-id $cvmAgent.Id --key-permissions get release
102102
```

articles/confidential-computing/quick-create-confidential-vm-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ To create a confidential VM in the Azure portal using an Azure Marketplace image
8080
8181
1. On the tab **Disks**, configure the following settings:
8282
83-
1. Under **Disk options**, enable **Confidential compute encryption** if you want to encrypt your VM's OS disk during creation.
83+
1. Under **Disk options**, enable **Confidential OS disk encryption** if you want to encrypt your VM's OS disk during creation.
8484
85-
1. For **Confidential compute encryption type**, select the type of encryption to use.
85+
1. For **Key Management**, select the type of key to use.
8686
8787
1. If **Confidential disk encryption with a customer-managed key** is selected, create a **Confidential disk encryption set** before creating your confidential VM.
8888
1. If you want to encrypt your VM's temp disk, please refer to the [following documentation](https://aka.ms/CVM-tdisk-encrypt).

articles/confidential-computing/tdx-confidential-vm-overview.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

articles/virtual-machines/dcesv5-dcedsv5-series.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.date: 11/14/2023
1818

1919
> [!IMPORTANT]
2020
> These virtual machines are in public preview and not recommended for production usage.
21-
> These VMs are available in West Europe, Central US and East US 2; North Europe will be available in January 2024.
21+
> These VMs are available in West Europe, Central US, East US 2 and North Europe.
2222
2323
The DCesv5-series and DCedsv5-series are [Azure confidential VMs](../confidential-computing/confidential-vm-overview.md) that can be used to protect the confidentiality and integrity of your code and data while it's being processed in the public cloud. Organizations can use these VMs to seamlessly bring confidential workloads to the cloud without any code changes to the application.
2424

@@ -41,7 +41,7 @@ These VMs have native support for [confidential disk encryption](disk-encryption
4141
- [Premium Storage](premium-storage-performance.md)
4242
- [Premium Storage caching](premium-storage-performance.md)
4343
- [VM Generation 2](generation-2.md)
44-
- [Ephemeral OS Disks](ephemeral-os-disks.md) - DCedsv5 only
44+
- [Ephemeral OS Disk](ephemeral-os-disks.md) - DCedsv5 only
4545

4646
*Unsupported* features include:
4747

articles/virtual-machines/ecesv5-ecedsv5-series.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.date: 11/14/2023
1818

1919
> [!IMPORTANT]
2020
> These virtual machines are in public preview and not recommended for production usage.
21-
> These VMs are available in West Europe, Central US and East US 2; North Europe will be available in January 2024.
21+
> These VMs are available in West Europe, Central US, East US 2 and North Europe.
2222
2323
The ECesv5-series and ECedsv5-series are [Azure confidential VMs](../confidential-computing/confidential-vm-overview.md) that can be used to protect the confidentiality and integrity of your code and data while it's being processed in the public cloud. Organizations can use these VMs to seamlessly bring confidential workloads to the cloud without any code changes to the application.
2424

@@ -41,7 +41,7 @@ These VMs have native support for [confidential disk encryption](disk-encryption
4141
- [Premium Storage](premium-storage-performance.md)
4242
- [Premium Storage caching](premium-storage-performance.md)
4343
- [VM Generation 2](generation-2.md)
44-
- [Ephemeral OS Disks](ephemeral-os-disks.md) - ECedsv5 only
44+
- [Ephemeral OS Disk](ephemeral-os-disks.md) - ECedsv5 only
4545

4646
*Unsupported* features in ECesv5-series VMs:
4747

0 commit comments

Comments
 (0)