Skip to content

Commit 8f3fcfc

Browse files
authored
Merge pull request MicrosoftDocs#96766 from mumian/1121-adm
remove the location restriction
2 parents 418cf6d + 6ce1c35 commit 8f3fcfc

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

articles/azure-resource-manager/deployment-manager-overview.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Safe deployment across regions - Azure Deployment Manager
33
description: Describes how to deploy a service over many regions with Azure Deployment Manager. It shows safe deployment practices to verify the stability of your deployment before rolling out to all regions.
44
ms.topic: conceptual
5-
ms.date: 05/31/2019
5+
ms.date: 11/21/2019
66
ms.custom: seodec18
77
---
88
# Enable safe deployment practices with Azure Deployment Manager (Public preview)
@@ -331,4 +331,6 @@ You manage versioned deployments by creating new folders and passing in that roo
331331
In this article, you learned about Deployment Manager. Proceed to the next article to learn how to deploy with Deployment Manager.
332332

333333
> [!div class="nextstepaction"]
334-
> [Tutorial: Use Azure Deployment Manager with Resource Manager templates](./deployment-manager-tutorial.md)
334+
> [Tutorial: Use Azure Deployment Manager with Resource Manager templates](./deployment-manager-tutorial.md)
335+
>
336+
> [Quickstart: Try out Azure Deployment Manager in just a few minutes](https://github.com/Azure-Samples/adm-quickstart)

articles/azure-resource-manager/deployment-manager-tutorial.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use Azure Deployment Manager with Resource Manager templates | Microsoft Docs
33
description: Use Resource Manager templates with Azure Deployment Manager to deploy Azure resources.
44
author: mumian
5-
ms.date: 10/10/2019
5+
ms.date: 11/21/2019
66
ms.topic: tutorial
77
ms.author: jgao
88

@@ -182,9 +182,6 @@ Later in the tutorial, you deploy a rollout. A user-assigned managed identity is
182182

183183
You need to create a user-assigned managed identity and configure the access control for your subscription.
184184

185-
> [!IMPORTANT]
186-
> The user-assigned managed identity must be in the same location as the [rollout](#create-the-rollout-template). Currently, the Deployment Manager resources, including rollout, can only be created in either Central US or East US 2. However, this is only true for the Deployment Manager resources (such as the service topology, services, service units, rollout, and steps). Your target resources can be deployed to any supported Azure region. In this tutorial, for example, the Deployment Manager resources are deployed to Central US, but the services are deployed to East US and West US. This restriction will be lifted in the future.
187-
188185
1. Sign in to the [Azure portal](https://portal.azure.com).
189186
2. Create a [user-assigned managed identity](../active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal.md).
190187
3. From the portal, select **Subscriptions** from the left menu, and then select your subscription.
@@ -207,7 +204,7 @@ Open **\ADMTemplates\CreateADMServiceTopology.json**.
207204
The template contains the following parameters:
208205

209206
* **projectName**: This name is used to create the names for the Deployment Manager resources. For example, using "jdoe", the service topology name is **jdoe**ServiceTopology. The resource names are defined in the variables section of this template.
210-
* **azureResourcelocation**: To simplify the tutorial, all resources share this location unless it is specified otherwise. Currently, Azure Deployment Manager resources can only be created in either **Central US** or **East US 2**.
207+
* **azureResourcelocation**: To simplify the tutorial, all resources share this location unless it is specified otherwise.
211208
* **artifactSourceSASLocation**: The SAS URI to the Blob container where service unit template and parameters files are stored for deployment. See [Prepare the artifacts](#prepare-the-artifacts).
212209
* **templateArtifactRoot**: The offset path from the Blob container where the templates and parameters are stored. The default value is **templates/1.0.0.0**. Don't change this value unless you want to change the folder structure explained in [Prepare the artifacts](#prepare-the-artifacts). Relative paths are used in this tutorial. The full path is constructed by concatenating **artifactSourceSASLocation**, **templateArtifactRoot**, and **templateArtifactSourceRelativePath** (or **parametersArtifactSourceRelativePath**).
213210
* **targetSubscriptionID**: The subscription ID to which the Deployment Manager resources are going to be deployed and billed. Use your subscription ID in this tutorial.
@@ -262,7 +259,7 @@ The template contains the following parameters:
262259
![Azure Deployment Manager tutorial rollout template parameters](./media/deployment-manager-tutorial/azure-deployment-manager-tutorial-rollout-template-parameters.png)
263260

264261
* **projectName**: This name is used to create the names for the Deployment Manager resources. For example, using "jdoe", the rollout name is **jdoe**Rollout. The names are defined in the variables section of the template.
265-
* **azureResourcelocation**: To simplify the tutorial, all Deployment Manager resources share this location unless it is specified otherwise. Currently, Azure Deployment Manager resources can only be created in either **Central US** or **East US 2**.
262+
* **azureResourcelocation**: To simplify the tutorial, all Deployment Manager resources share this location unless it is specified otherwise.
266263
* **artifactSourceSASLocation**: The SAS URI to the root directory (the Blob container) where service unit template and parameters files are stored for deployment. See [Prepare the artifacts](#prepare-the-artifacts).
267264
* **binaryArtifactRoot**: The default value is **binaries/1.0.0.0**. Don't change this value unless you want to change the folder structure explained in [Prepare the artifacts](#prepare-the-artifacts). Relative paths are used in this tutorial. The full path is constructed by concatenating **artifactSourceSASLocation**, **binaryArtifactRoot**, and the **deployPackageUri** specified in the CreateWebApplicationParameters.json. See [Prepare the artifacts](#prepare-the-artifacts).
268265
* **managedIdentityID**: The user-assigned managed identity that performs the deployment actions. See [Create the user-assigned managed identity](#create-the-user-assigned-managed-identity).
@@ -304,7 +301,7 @@ You create a parameters file used with the rollout template.
304301
2. Fill the parameter values:
305302

306303
* **projectName**: Enter a string with 4-5 characters. This name is used to create unique azure resource names.
307-
* **azureResourceLocation**: Currently, Azure Deployment Manager resources can only be created in either **Central US** or **East US 2**.
304+
* **azureResourceLocation**: Specify an Azure location.
308305
* **artifactSourceSASLocation**: Enter the SAS URI to the root directory (the Blob container) where service unit template and parameters files are stored for deployment. See [Prepare the artifacts](#prepare-the-artifacts).
309306
* **binaryArtifactRoot**: Unless you change the folder structure of the artifacts, use **binaries/1.0.0.0** in this tutorial.
310307
* **managedIdentityID**: Enter the user-assigned managed identity. See [Create the user-assigned managed identity](#create-the-user-assigned-managed-identity). The syntax is:

0 commit comments

Comments
 (0)