Change template depenency order to reduce window where web can downgrade sku

This commit is contained in:
James Webster 2016-06-22 18:27:31 -07:00
Родитель 54746f7373
Коммит a1233dbb7f
2 изменённых файлов: 48 добавлений и 80 удалений

Просмотреть файл

@ -637,7 +637,13 @@
"sku": "[parameters('webSku')]",
"workerSize": "[parameters('webWorkerSize')]",
"numberOfWorkers": "[parameters('webWorkerCount')]"
}
},
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.BingMaps/mapApis', variables('bingMapsName'))]"
]
},
{
"apiVersion": "[variables('webVersion')]",
@ -654,7 +660,14 @@
"numberOfWorkers": "[parameters('webJobWorkerCount')]"
},
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.BingMaps/mapApis', variables('bingMapsName'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Telemetry'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-DeviceInfo'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Rules'))]"
]
},
{
@ -663,17 +676,16 @@
"type": "Microsoft.Web/sites",
"location": "[variables('location')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.BingMaps/mapApis', variables('bingMapsName'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]"
],
"tags": {
"IotSuiteType": "[variables('suiteType')]"
},
"properties": {
"serverFarmId": "[variables('webPlanName')]"
"serverFarmId": "[variables('webPlanName')]",
"siteConfig": {
"AlwaysOn": true
}
},
"resources": [
{
@ -689,18 +701,6 @@
"dbType": ""
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Web",
"type": "config",
"dependsOn": [
"[resourceId('Microsoft.Web/Sites', variables('webSiteName'))]",
"[concat('Microsoft.Web/Sites/', variables('webSiteName'), '/Extensions/MSDeploy')]"
],
"properties": {
"AlwaysOn": true,
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Appsettings",
@ -737,17 +737,13 @@
"type": "Microsoft.Web/sites",
"location": "[variables('location')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webJobPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.BingMaps/mapApis', variables('bingMapsName'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Telemetry'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-DeviceInfo'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Rules'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webJobPlanName'))]"
],
"tags": {
"IotSuiteType": "[variables('suiteType')]"
"IotSuiteType": "[variables('suiteType')]",
"siteConfig": {
"AlwaysOn": true
}
},
"properties": {
"serverFarmId": "[variables('webJobPlanName')]"
@ -766,18 +762,6 @@
"dbType": ""
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Web",
"type": "config",
"dependsOn": [
"[resourceId('Microsoft.Web/Sites', variables('webJobSiteName'))]",
"[concat('Microsoft.Web/Sites/', variables('webJobSiteName'), '/Extensions/MSDeploy')]"
],
"properties": {
"AlwaysOn": true
}
},
{
"apiVersion": "[variables('webVersion')]",

Просмотреть файл

@ -626,7 +626,12 @@
"sku": "[parameters('webSku')]",
"workerSize": "[parameters('webWorkerSize')]",
"numberOfWorkers": "[parameters('webWorkerCount')]"
}
},
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]"
]
},
{
"apiVersion": "[variables('webVersion')]",
@ -643,7 +648,13 @@
"numberOfWorkers": "[parameters('webJobWorkerCount')]"
},
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Telemetry'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-DeviceInfo'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Rules'))]"
]
},
{
@ -652,16 +663,16 @@
"type": "Microsoft.Web/sites",
"location": "[variables('location')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webPlanName'))]"
],
"tags": {
"IotSuiteType": "[variables('suiteType')]"
},
"properties": {
"serverFarmId": "[variables('webPlanName')]"
"serverFarmId": "[variables('webPlanName')]",
"siteConfig": {
"AlwaysOn": true
}
},
"resources": [
{
@ -677,18 +688,6 @@
"dbType": ""
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Web",
"type": "config",
"dependsOn": [
"[resourceId('Microsoft.Web/Sites', variables('webSiteName'))]",
"[concat('Microsoft.Web/Sites/', variables('webSiteName'), '/Extensions/MSDeploy')]"
],
"properties": {
"AlwaysOn": true
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Appsettings",
@ -725,19 +724,16 @@
"type": "Microsoft.Web/sites",
"location": "[variables('location')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('webJobPlanName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageName'))]",
"[resourceId('Microsoft.DocumentDb/databaseAccounts', parameters('docDBName'))]",
"[resourceId('Microsoft.Devices/Iothubs', parameters('iotHubName'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Telemetry'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-DeviceInfo'))]",
"[resourceId('Microsoft.StreamAnalytics/streamingjobs', concat(parameters('suiteName'), '-Rules'))]"
"[resourceId('Microsoft.Web/serverfarms', variables('webJobPlanName'))]"
],
"tags": {
"IotSuiteType": "[variables('suiteType')]"
},
"properties": {
"serverFarmId": "[variables('webJobPlanName')]"
"serverFarmId": "[variables('webJobPlanName')]",
"siteConfig": {
"AlwaysOn": true
}
},
"resources": [
{
@ -753,18 +749,6 @@
"dbType": ""
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Web",
"type": "config",
"dependsOn": [
"[resourceId('Microsoft.Web/Sites', variables('webJobSiteName'))]",
"[concat('Microsoft.Web/Sites/', variables('webJobSiteName'), '/Extensions/MSDeploy')]"
],
"properties": {
"AlwaysOn": true
}
},
{
"apiVersion": "[variables('webVersion')]",
"name": "Appsettings",