Skip to content

Commit 10541dd

Browse files
authored
Merge pull request #101294 from mumian/0115-order-concepts
order the properties
2 parents b771bd1 + f04edc4 commit 10541dd

File tree

4 files changed

+218
-218
lines changed

4 files changed

+218
-218
lines changed

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

Lines changed: 122 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,20 @@ The following example shows the general format of the artifact source.
6060

6161
```json
6262
{
63-
"type": "Microsoft.DeploymentManager/artifactSources",
64-
"name": "<artifact-source-name>",
65-
"location": "<artifact-source-location>",
66-
"apiVersion": "2018-09-01-preview",
67-
"properties": {
68-
"sourceType": "AzureStorage",
69-
"artifactRoot": "<root-folder-for-templates>",
70-
"authentication": {
71-
"type": "SAS",
72-
"properties": {
73-
"sasUri": "<SAS-URI-for-storage-container>"
74-
}
75-
}
76-
}
63+
"type": "Microsoft.DeploymentManager/artifactSources",
64+
"apiVersion": "2018-09-01-preview",
65+
"name": "<artifact-source-name>",
66+
"location": "<artifact-source-location>",
67+
"properties": {
68+
"sourceType": "AzureStorage",
69+
"artifactRoot": "<root-folder-for-templates>",
70+
"authentication": {
71+
"type": "SAS",
72+
"properties": {
73+
"sasUri": "<SAS-URI-for-storage-container>"
74+
}
75+
}
76+
}
7777
}
7878
```
7979

@@ -85,20 +85,20 @@ The following example shows the general format of the service topology resource.
8585

8686
```json
8787
{
88-
"type": "Microsoft.DeploymentManager/serviceTopologies",
89-
"name": "<topology-name>",
90-
"location": "<topology-location>",
91-
"apiVersion": "2018-09-01-preview",
92-
"properties": {
93-
"artifactSourceId": "<resource-ID-artifact-source>"
94-
},
95-
"dependsOn": [
96-
"<artifact-source>"
97-
],
98-
"resources": [
99-
{
100-
"type": "services",
101-
...
88+
"type": "Microsoft.DeploymentManager/serviceTopologies",
89+
"apiVersion": "2018-09-01-preview",
90+
"name": "<topology-name>",
91+
"location": "<topology-location>",
92+
"dependsOn": [
93+
"<artifact-source>"
94+
],
95+
"properties": {
96+
"artifactSourceId": "<resource-ID-artifact-source>"
97+
},
98+
"resources": [
99+
{
100+
"type": "services",
101+
...
102102
}
103103
]
104104
}
@@ -112,20 +112,20 @@ The following example shows the general format of the services resource. In each
112112

113113
```json
114114
{
115-
"type": "services",
116-
"name": "<service-name>",
117-
"location": "<service-location>",
118-
"apiVersion": "2018-09-01-preview",
119-
"dependsOn": [
120-
"<service-topology>"
121-
],
122-
"properties": {
123-
"targetSubscriptionId": "<subscription-ID>",
124-
"targetLocation": "<location-of-deployed-service>"
125-
},
126-
"resources": [
127-
{
128-
"type": "serviceUnits",
115+
"type": "services",
116+
"apiVersion": "2018-09-01-preview",
117+
"name": "<service-name>",
118+
"location": "<service-location>",
119+
"dependsOn": [
120+
"<service-topology>"
121+
],
122+
"properties": {
123+
"targetSubscriptionId": "<subscription-ID>",
124+
"targetLocation": "<location-of-deployed-service>"
125+
},
126+
"resources": [
127+
{
128+
"type": "serviceUnits",
129129
...
130130
}
131131
]
@@ -140,24 +140,24 @@ The following example shows the general format of the service units resource. In
140140

141141
```json
142142
{
143-
"type": "serviceUnits",
144-
"name": "<service-unit-name>",
145-
"location": "<service-unit-location>",
146-
"apiVersion": "2018-09-01-preview",
147-
"dependsOn": [
148-
"<service>"
149-
],
150-
"tags": {
151-
"serviceType": "Service West US Web App"
152-
},
153-
"properties": {
154-
"targetResourceGroup": "<resource-group-name>",
155-
"deploymentMode": "Incremental",
156-
"artifacts": {
157-
"templateArtifactSourceRelativePath": "<relative-path-to-template>",
158-
"parametersArtifactSourceRelativePath": "<relative-path-to-parameter-file>"
159-
}
160-
}
143+
"type": "serviceUnits",
144+
"apiVersion": "2018-09-01-preview",
145+
"name": "<service-unit-name>",
146+
"location": "<service-unit-location>",
147+
"dependsOn": [
148+
"<service>"
149+
],
150+
"tags": {
151+
"serviceType": "Service West US Web App"
152+
},
153+
"properties": {
154+
"targetResourceGroup": "<resource-group-name>",
155+
"deploymentMode": "Incremental",
156+
"artifacts": {
157+
"templateArtifactSourceRelativePath": "<relative-path-to-template>",
158+
"parametersArtifactSourceRelativePath": "<relative-path-to-parameter-file>"
159+
}
160+
}
161161
}
162162
```
163163

@@ -193,10 +193,10 @@ The wait step pauses the deployment before continuing. It allows you to verify t
193193

194194
```json
195195
{
196-
"apiVersion": "2018-09-01-preview",
197196
"type": "Microsoft.DeploymentManager/steps",
197+
"apiVersion": "2018-09-01-preview",
198198
"name": "waitStep",
199-
"location": "<step-location>",
199+
"location": "<step-location>",
200200
"properties": {
201201
"stepType": "wait",
202202
"attributes": {
@@ -222,32 +222,32 @@ The following example shows the general format of the rollout.
222222

223223
```json
224224
{
225-
"type": "Microsoft.DeploymentManager/rollouts",
226-
"name": "<rollout-name>",
227-
"location": "<rollout-location>",
228-
"apiVersion": "2018-09-01-preview",
229-
"Identity": {
230-
"type": "userAssigned",
231-
"identityIds": [
232-
"<managed-identity-ID>"
233-
]
234-
},
235-
"dependsOn": [
236-
"<artifact-source>"
237-
],
238-
"properties": {
239-
"buildVersion": "1.0.0.0",
240-
"artifactSourceId": "<artifact-source-ID>",
241-
"targetServiceTopologyId": "<service-topology-ID>",
242-
"stepGroups": [
243-
{
244-
"name": "stepGroup1",
245-
"dependsOnStepGroups": ["<step-group-name>"],
246-
"preDeploymentSteps": ["<step-ID>"],
247-
"deploymentTargetId":
248-
"<service-unit-ID>",
249-
"postDeploymentSteps": ["<step-ID>"]
250-
},
225+
"type": "Microsoft.DeploymentManager/rollouts",
226+
"apiVersion": "2018-09-01-preview",
227+
"name": "<rollout-name>",
228+
"location": "<rollout-location>",
229+
"Identity": {
230+
"type": "userAssigned",
231+
"identityIds": [
232+
"<managed-identity-ID>"
233+
]
234+
},
235+
"dependsOn": [
236+
"<artifact-source>"
237+
],
238+
"properties": {
239+
"buildVersion": "1.0.0.0",
240+
"artifactSourceId": "<artifact-source-ID>",
241+
"targetServiceTopologyId": "<service-topology-ID>",
242+
"stepGroups": [
243+
{
244+
"name": "stepGroup1",
245+
"dependsOnStepGroups": ["<step-group-name>"],
246+
"preDeploymentSteps": ["<step-ID>"],
247+
"deploymentTargetId":
248+
"<service-unit-ID>",
249+
"postDeploymentSteps": ["<step-ID>"]
250+
},
251251
...
252252
]
253253
}
@@ -270,21 +270,21 @@ For example, during rollout you create an artifact source for the binary artifac
270270

271271
```json
272272
{
273-
"type": "Microsoft.DeploymentManager/artifactSources",
274-
"name": "[variables('rolloutArtifactSource').name]",
275-
"location": "[parameters('azureResourceLocation')]",
276-
"apiVersion": "2018-09-01-preview",
277-
"properties": {
278-
"sourceType": "AzureStorage",
279-
"artifactRoot": "[parameters('binaryArtifactRoot')]",
280-
"authentication" :
281-
{
282-
"type": "SAS",
283-
"properties": {
284-
"sasUri": "[parameters('artifactSourceSASLocation')]"
285-
}
286-
}
287-
}
273+
"type": "Microsoft.DeploymentManager/artifactSources",
274+
"apiVersion": "2018-09-01-preview",
275+
"name": "[variables('rolloutArtifactSource').name]",
276+
"location": "[parameters('azureResourceLocation')]",
277+
"properties": {
278+
"sourceType": "AzureStorage",
279+
"artifactRoot": "[parameters('binaryArtifactRoot')]",
280+
"authentication" :
281+
{
282+
"type": "SAS",
283+
"properties": {
284+
"sasUri": "[parameters('artifactSourceSASLocation')]"
285+
}
286+
}
287+
}
288288
},
289289
```
290290

@@ -294,33 +294,33 @@ Your template and parameter file need to know the correct path for getting the v
294294

295295
```json
296296
{
297-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
298-
"contentVersion": "1.0.0.0",
299-
"parameters": {
300-
"deployPackageUri": {
301-
"value": "$containerRoot\\helloWorldWebAppWUS.zip"
302-
}
297+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
298+
"contentVersion": "1.0.0.0",
299+
"parameters": {
300+
"deployPackageUri": {
301+
"value": "$containerRoot\\helloWorldWebAppWUS.zip"
303302
}
303+
}
304304
}
305305
```
306306

307307
Then, use that parameter in your template:
308308

309309
```json
310310
{
311-
"name": "MSDeploy",
312-
"type": "extensions",
313-
"location": "[parameters('location')]",
314-
"apiVersion": "2015-08-01",
315-
"dependsOn": [
316-
"[concat('Microsoft.Web/sites/', parameters('WebAppName'))]"
317-
],
318-
"tags": {
319-
"displayName": "WebAppMSDeploy"
320-
},
321-
"properties": {
322-
"packageUri": "[parameters('deployPackageURI')]"
323-
}
311+
"name": "MSDeploy",
312+
"apiVersion": "2015-08-01",
313+
"type": "extensions",
314+
"location": "[parameters('location')]",
315+
"dependsOn": [
316+
"[concat('Microsoft.Web/sites/', parameters('WebAppName'))]"
317+
],
318+
"tags": {
319+
"displayName": "WebAppMSDeploy"
320+
},
321+
"properties": {
322+
"packageUri": "[parameters('deployPackageURI')]"
323+
}
324324
}
325325
```
326326

0 commit comments

Comments
 (0)