Skip to content

Commit 4213e0a

Browse files
Merge pull request #268355 from rolyon/rolyon-msi-includes-rename-metadata
[Managed identities] Include rename metadata
2 parents 4cb545b + 29bd5bd commit 4213e0a

6 files changed

+14
-14
lines changed

articles/cosmos-db/how-to-setup-cross-tenant-customer-managed-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Data stored in your Azure Cosmos DB account is automatically and seamlessly encr
1919
This article walks through how to configure encryption with customer-managed keys at the time that you create an Azure Cosmos DB account. In this example cross-tenant scenario, the Azure Cosmos DB account resides in a tenant managed by an Independent Software Vendor (ISV) referred to as the service provider. The key used for encryption of the Azure Cosmos DB account resides in a key vault in a different tenant that is managed by the customer.
2020

2121

22-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-overview](../../includes/active-directory-msi-cross-tenant-cmk-overview.md)]
22+
[!INCLUDE [entra-msi-cross-tenant-cmk-overview](../../includes/entra-msi-cross-tenant-cmk-overview.md)]
2323

24-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../includes/active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
24+
[!INCLUDE [entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../includes/entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
2525

2626
## Create a new Azure Cosmos DB account encrypted with a key from a different tenant
2727

articles/storage/common/customer-managed-keys-configure-cross-tenant-existing-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ To learn how to configure customer-managed keys for a new storage account, see [
2525
> [!NOTE]
2626
> Azure Key Vault and Azure Key Vault Managed HSM support the same APIs and management interfaces for configuration of customer-managed keys. Any action that is supported for Azure Key Vault is also supported for Azure Key Vault Managed HSM.
2727
28-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-overview](../../../includes/active-directory-msi-cross-tenant-cmk-overview.md)]
28+
[!INCLUDE [entra-msi-cross-tenant-cmk-overview](../../../includes/entra-msi-cross-tenant-cmk-overview.md)]
2929

30-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../../includes/active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
30+
[!INCLUDE [entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../../includes/entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
3131

3232
## Configure customer-managed keys for an existing account
3333

articles/storage/common/customer-managed-keys-configure-cross-tenant-new-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ To learn how to configure customer-managed keys for an existing storage account,
2525
> [!NOTE]
2626
> Azure Key Vault and Azure Key Vault Managed HSM support the same APIs and management interfaces for configuration of customer-managed keys. Any action that is supported for Azure Key Vault is also supported for Azure Key Vault Managed HSM.
2727
28-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-overview](../../../includes/active-directory-msi-cross-tenant-cmk-overview.md)]
28+
[!INCLUDE [entra-msi-cross-tenant-cmk-overview](../../../includes/entra-msi-cross-tenant-cmk-overview.md)]
2929

30-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../../includes/active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
30+
[!INCLUDE [entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../../includes/entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
3131

3232
## Create a new storage account encrypted with a key from a different tenant
3333

articles/virtual-machines/disks-cross-tenant-customer-managed-keys.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ If you have questions about cross-tenant customer-managed keys with managed disk
2323
- This feature doesn't support Ultra Disks or Azure Premium SSD v2 managed disks.
2424
- This feature isn't available in Microsoft Azure operated by 21Vianet or Government clouds.
2525

26-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-overview](../../includes/active-directory-msi-cross-tenant-cmk-overview.md)]
26+
[!INCLUDE [entra-msi-cross-tenant-cmk-overview](../../includes/entra-msi-cross-tenant-cmk-overview.md)]
2727

28-
[!INCLUDE [active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../includes/active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
28+
[!INCLUDE [entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault](../../includes/entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md)]
2929

3030
## Create a disk encryption set
3131

includes/active-directory-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md renamed to includes/entra-msi-cross-tenant-cmk-create-identities-authorize-key-vault.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
author: karavar
33
ms.author: vakarand
44
ms.date: 10/28/2022
5-
ms.service: active-directory
6-
ms.subservice: managed-identity
5+
ms.service: entra-id
6+
ms.subservice: managed-identities
77
ms.custom: devx-track-azurecli, devx-track-azurepowershell
88
ms.topic: include
99
title: Cross-tenant customer-managed key (CMK) configuration - Azure
1010
description: include file for cross-tenant customer-managed key (CMK) configuration
11-
services: active-directory
11+
1212
---
1313

1414
## Configure cross-tenant customer-managed keys

includes/active-directory-msi-cross-tenant-cmk-overview.md renamed to includes/entra-msi-cross-tenant-cmk-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
author: karavar
33
ms.author: vakarand
44
ms.date: 11/07/2023
5-
ms.service: active-directory
6-
ms.subservice: managed-identity
5+
ms.service: entra-id
6+
ms.subservice: managed-identities
77
ms.custom: has-azure-ad-ps-ref
88
ms.topic: include
99
title: Cross tenant customer-managed key (CMK) overview - Azure
1010
description: include file for cross-tenant customer-managed key (CMK) overview
11-
services: active-directory
11+
1212
---
1313

1414
## About cross-tenant customer-managed keys

0 commit comments

Comments
 (0)