From 4e01ad91767e1f7cd565d36eda4b75a94ffdc91c Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 10:26:19 +0200 Subject: [PATCH 01/19] ase-v2-template-new-inlcuding-hosting --- 201-asev2-ilb-with-web-app/README.md | 10 ++ 201-asev2-ilb-with-web-app/azuredeploy.json | 166 ++++++++++++++++++ .../azuredeploy.parameters.json | 36 ++++ 201-asev2-ilb-with-web-app/metadata.json | 7 + 4 files changed, 219 insertions(+) create mode 100644 201-asev2-ilb-with-web-app/README.md create mode 100644 201-asev2-ilb-with-web-app/azuredeploy.json create mode 100644 201-asev2-ilb-with-web-app/azuredeploy.parameters.json create mode 100644 201-asev2-ilb-with-web-app/metadata.json diff --git a/201-asev2-ilb-with-web-app/README.md b/201-asev2-ilb-with-web-app/README.md new file mode 100644 index 000000000000..6b981c13ce15 --- /dev/null +++ b/201-asev2-ilb-with-web-app/README.md @@ -0,0 +1,10 @@ +# Create an App Service Environment v2 with an ILB Address and a Hosting Plan with a Azure WebApp + + + + + + + + +For more details on App Service Environments, see the [Introduction to App Service Environments](https://docs.microsoft.com/en-us/azure/app-service/app-service-environment/intro). diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json new file mode 100644 index 000000000000..da323f6b9330 --- /dev/null +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -0,0 +1,166 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", + "contentVersion": "1.0.0.0", + "parameters": { + "aseName": { + "type": "string", + "metadata": { + "description": "Name of the App Service Environment" + } + }, + "vnetResourceGroupName": { + "type": "string", + "metadata": { + "description": "Name of the resource group containing the existing VNET" + } + }, + "vnetResourceName": { + "type": "string", + "metadata": { + "description": "Name of the existing internal VNET" + } + }, + "subnetName": { + "type": "string", + "metadata": { + "description": "Subnet name that will contain the App Service Environment" + } + }, + "aseLocation": { + "type": "string", + "metadata": { + "description": "Specific parameter used because the ASE api can't handle the resource group location" + } + }, + "internalLoadBalancingMode": { + "type": "int", + "defaultValue": 3, + "allowedValues": [ 0, 1, 2, 3 ], + "metadata": { + "description": "0 = public VIP only, 1 = only ports 80/443 are mapped to ILB VIP, 2 = only FTP ports are mapped to ILB VIP, 3 = both ports 80/443 and FTP ports are mapped to an ILB VIP." + } + }, + "dnsSuffix": { + "type": "string", + "metadata": { + "description": "Used when deploying an ILB enabled ASE. Set this to the root domain associated with the ASE. For example: contoso.com" + } + }, + "siteName": { + "type": "string", + "metadata": { + "description": "The name of the web app that will be created." + } + }, + "appServicePlanName": { + "type": "string", + "metadata": { + "description": "The name of the App Service plan to use for hosting the web app." + } + }, + "owner": { + "type": "string", + "metadata": { + "description": "The owner of the resource will be used for tagging." + } + }, + "workerPool": { + "type": "string", + "allowedValues": [ + "1", + "2", + "3" + ], + "defaultValue": 1, + "metadata": { + "description": "Defines which worker pool's (WP1, WP2 or WP3) resources will be used for the app service plan." + } + }, + "numberOfWorkersFromWorkerPool": { + "type": "int", + "defaultValue": 1, + "metadata": { + "description": "Defines the number of workers from the worker pool that will be used by the app service plan." + } + } + }, + "variables": { + "vnetID": "[resourceId(parameters('vnetResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('vnetResourceName'))]" + }, + "resources": [ + { + "apiVersion": "2015-08-01", + "type": "Microsoft.Web/hostingEnvironments", + "name": "[parameters('aseName')]", + "kind": "ASEV2", + "location": "[parameters('aseLocation')]", + "tags": { + "displayName": "ASE Environment", + "usage": "Hosting PaaS applications", + "category": "Environment", + "owner": "[parameters('owner')]" + }, + "properties": { + "name": "[parameters('aseName')]", + "location": "[parameters('aseLocation')]", + "ipSslAddressCount": 0, + "internalLoadBalancingMode": "[parameters('internalLoadBalancingMode')]", + "dnsSuffix": "[parameters('dnsSuffix')]", + "virtualNetwork": { + "Id": "[variables('vnetID')]", + "Subnet": "[parameters('subnetName')]" + } + } + }, + { + "apiVersion": "2015-08-01", + "name": "[parameters('appServicePlanName')]", + "type": "Microsoft.Web/serverfarms", + "location": "[parameters('aseLocation')]", + "tags": { + "displayName": "ASE Hosting Plan", + "usage": "Hosting Plan within ASE", + "category": "Hosting", + "owner": "[parameters('owner')]" + }, + "properties": { + "name": "[parameters('appServicePlanName')]", + "hostingEnvironmentProfile": { + "id": "[resourceId('Microsoft.Web/hostingEnvironments/',parameters('aseName'))]" + } + }, + "sku": { + "name": "[concat('I',parameters('workerPool'))]", + "tier": "Premium", + "size": "[concat('I',parameters('workerPool'))]", + "family": "I", + "capacity": "[parameters('numberOfWorkersFromWorkerPool')]" + }, + "dependsOn": [ + "[concat('Microsoft.Web/hostingEnvironments/',parameters('aseName'))]" + ] + }, + { + "apiVersion": "2015-08-01", + "name": "[parameters('siteName')]", + "type": "Microsoft.Web/sites", + "location": "[resourceGroup().location]", + "tags": { + "displayName": "ASE Web App", + "usage": "Web App Hosted within ASE", + "category": "Web App", + "owner": "[parameters('owner')]" + }, + "properties": { + "name": "[parameters('siteName')]", + "serverFarmId": "[resourceId('Microsoft.Web/serverFarms',parameters('appServicePlanName'))]", + "hostingEnvironmentProfile": { + "id": "[resourceId('Microsoft.Web/hostingEnvironments/', parameters('aseName'))]" + } + }, + "dependsOn": [ + "[concat('Microsoft.Web/serverFarms/',parameters('appServicePlanName'))]" + ] + } + ] +} \ No newline at end of file diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json new file mode 100644 index 000000000000..ff2737bd449a --- /dev/null +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -0,0 +1,36 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json", + "contentVersion": "1.0.0.0", + "parameters": { + "aseName": { + "value": "GEN-UNIQUE" + }, + "vnetResourceGroupName": { + "value": "changeme" + }, + "vnetResourceName": { + "value": "changeme" + }, + "subnetName": { + "value": "changeme" + }, + "aseLocation": { + "value": "West Europe" + }, + "internalLoadBalancingMode": { + "value": 3 + }, + "dnsSuffix": { + "value": "changeme" + }, + "siteName": { + "value": "GEN-UNIQUE" + }, + "appServicePlanName": { + "value": "changeme" + }, + "owner": { + "value": "changeme" + } + } +} \ No newline at end of file diff --git a/201-asev2-ilb-with-web-app/metadata.json b/201-asev2-ilb-with-web-app/metadata.json new file mode 100644 index 000000000000..fc7c37978928 --- /dev/null +++ b/201-asev2-ilb-with-web-app/metadata.json @@ -0,0 +1,7 @@ +{ + "itemDisplayName": "Create App Service Environment v2 with an ILB Address containing a Hosting Plan and Azure WebApp", + "description": "Creates an App Service Environment v2 with an ILB Address in a existing virtual network that will be privately availible. The App Service Environment will contain a Hosting Plan and a Azure Web App", + "summary": "Create App Service Environment v2 with an ILB Address containing a Hosting Plan and Azure WebApp", + "githubUsername": "maikvandergaag", + "dateUpdated": "2018-04-06" +} From 99bb13379e852ac615e0bac4dc17d56ffdec3b43 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 10:43:12 +0200 Subject: [PATCH 02/19] added prereqs --- .../azuredeploy.parameters.json | 12 ++--- 201-asev2-ilb-with-web-app/metadata.json | 4 +- .../prereqs/prereq.azuredeploy.json | 52 +++++++++++++++++++ .../prereq.azuredeploy.parameters.json | 6 +++ 4 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json create mode 100644 201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.parameters.json diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index ff2737bd449a..140fb13846ce 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -6,13 +6,13 @@ "value": "GEN-UNIQUE" }, "vnetResourceGroupName": { - "value": "changeme" + "value": "GET-PREREQ-existingResourceGroupName" }, "vnetResourceName": { - "value": "changeme" + "value": "GET-PREREQ-existingVnetResourceId" }, "subnetName": { - "value": "changeme" + "value": "GET-PREREQ-subnetName" }, "aseLocation": { "value": "West Europe" @@ -21,16 +21,16 @@ "value": 3 }, "dnsSuffix": { - "value": "changeme" + "value": "GEN-UNIQUE-10" }, "siteName": { "value": "GEN-UNIQUE" }, "appServicePlanName": { - "value": "changeme" + "value": "GEN-UNIQUE" }, "owner": { - "value": "changeme" + "value": "Owner" } } } \ No newline at end of file diff --git a/201-asev2-ilb-with-web-app/metadata.json b/201-asev2-ilb-with-web-app/metadata.json index fc7c37978928..801ecc476fe9 100644 --- a/201-asev2-ilb-with-web-app/metadata.json +++ b/201-asev2-ilb-with-web-app/metadata.json @@ -1,7 +1,7 @@ { - "itemDisplayName": "Create App Service Environment v2 with an ILB Address containing a Hosting Plan and Azure WebApp", + "itemDisplayName": "App Service Environment v2 - ILB with Hosting Plan and Azure WebApp", "description": "Creates an App Service Environment v2 with an ILB Address in a existing virtual network that will be privately availible. The App Service Environment will contain a Hosting Plan and a Azure Web App", - "summary": "Create App Service Environment v2 with an ILB Address containing a Hosting Plan and Azure WebApp", + "summary": "App Service Environment v2 - ILB with Hosting Plan and Azure WebApp", "githubUsername": "maikvandergaag", "dateUpdated": "2018-04-06" } diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json new file mode 100644 index 000000000000..ccb334853707 --- /dev/null +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -0,0 +1,52 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": {}, + "variables": { + "existingVirtualNetworkName": "vnet", + "existingSubnetName": "subnet-1", + "existingResourceGroupName": "[resourceGroup().name]" + }, + "resources": [ + { + "type": "Microsoft.Network/virtualNetworks", + "name": "[variables('existingVirtualNetworkName')]", + "apiVersion": "2016-03-30", + "location": "West Europe", + "comments": "Virtual network for overall solution", + "tags": { + "displayName": "Virtual Network" + }, + "dependsOn": [], + "properties": { + "addressSpace": { + "addressPrefixes": [ + "10.0.0.0/16" + ] + }, + "subnets": [ + { + "name": "[variables('existingSubnetName')]", + "properties": { + "addressPrefix": "10.0.1.0/24" + } + } + ] + } + } + ], + "outputs": { + "existingVnetResourceId": { + "type": "string", + "value": "[resourceId('Microsoft.Network/virtualNetworks/',variables('existingVirtualNetworkName'))]" + }, + "subnetName": { + "type": "string", + "value": "[variables('existingSubnetName')]" + }, + "resourceGroupName": { + "type": "string", + "value": "[variables('existingResourceGroupName')]" + } + } +} diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.parameters.json new file mode 100644 index 000000000000..0c3975662be1 --- /dev/null +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.parameters.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + } +} \ No newline at end of file From 18147b900aaad652cdf9dd3092dcb1b7a9541bc3 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 10:55:49 +0200 Subject: [PATCH 03/19] added a workerpool parameter --- 201-asev2-ilb-with-web-app/azuredeploy.json | 4 ++-- 201-asev2-ilb-with-web-app/azuredeploy.parameters.json | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index da323f6b9330..c9cff0684ef1 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -71,7 +71,7 @@ "2", "3" ], - "defaultValue": 1, + "defaultValue": "1", "metadata": { "description": "Defines which worker pool's (WP1, WP2 or WP3) resources will be used for the app service plan." } @@ -131,7 +131,7 @@ }, "sku": { "name": "[concat('I',parameters('workerPool'))]", - "tier": "Premium", + "tier": "Isolated", "size": "[concat('I',parameters('workerPool'))]", "family": "I", "capacity": "[parameters('numberOfWorkersFromWorkerPool')]" diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index 140fb13846ce..f125fc3d6a52 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -29,6 +29,9 @@ "appServicePlanName": { "value": "GEN-UNIQUE" }, + "workerPool": { + "value": "1" + }, "owner": { "value": "Owner" } From 1f54dbd8944d660fc68fa8a29eed44a3c8c12668 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 11:00:30 +0200 Subject: [PATCH 04/19] shorten title --- 201-asev2-ilb-with-web-app/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/201-asev2-ilb-with-web-app/metadata.json b/201-asev2-ilb-with-web-app/metadata.json index 801ecc476fe9..f62c0c0b5b95 100644 --- a/201-asev2-ilb-with-web-app/metadata.json +++ b/201-asev2-ilb-with-web-app/metadata.json @@ -1,5 +1,5 @@ { - "itemDisplayName": "App Service Environment v2 - ILB with Hosting Plan and Azure WebApp", + "itemDisplayName": "App Service Environment with Hosting Plan and Azure WebApp", "description": "Creates an App Service Environment v2 with an ILB Address in a existing virtual network that will be privately availible. The App Service Environment will contain a Hosting Plan and a Azure Web App", "summary": "App Service Environment v2 - ILB with Hosting Plan and Azure WebApp", "githubUsername": "maikvandergaag", From 2bc1541c5f29a552da7703567174f179c84a37f9 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 11:12:44 +0200 Subject: [PATCH 05/19] reordered --- 201-asev2-ilb-with-web-app/azuredeploy.json | 11 +---------- .../azuredeploy.parameters.json | 3 --- .../prereqs/prereq.azuredeploy.json | 8 ++------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index c9cff0684ef1..06b3497ebe45 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -8,12 +8,6 @@ "description": "Name of the App Service Environment" } }, - "vnetResourceGroupName": { - "type": "string", - "metadata": { - "description": "Name of the resource group containing the existing VNET" - } - }, "vnetResourceName": { "type": "string", "metadata": { @@ -84,9 +78,6 @@ } } }, - "variables": { - "vnetID": "[resourceId(parameters('vnetResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('vnetResourceName'))]" - }, "resources": [ { "apiVersion": "2015-08-01", @@ -107,7 +98,7 @@ "internalLoadBalancingMode": "[parameters('internalLoadBalancingMode')]", "dnsSuffix": "[parameters('dnsSuffix')]", "virtualNetwork": { - "Id": "[variables('vnetID')]", + "Id": "[parameters('vnetResourceName')]", "Subnet": "[parameters('subnetName')]" } } diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index f125fc3d6a52..5e2b73b40012 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -5,9 +5,6 @@ "aseName": { "value": "GEN-UNIQUE" }, - "vnetResourceGroupName": { - "value": "GET-PREREQ-existingResourceGroupName" - }, "vnetResourceName": { "value": "GET-PREREQ-existingVnetResourceId" }, diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json index ccb334853707..f20edb2d1e85 100644 --- a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -3,8 +3,8 @@ "contentVersion": "1.0.0.0", "parameters": {}, "variables": { - "existingVirtualNetworkName": "vnet", - "existingSubnetName": "subnet-1", + "existingVirtualNetworkName": "existingvnet", + "existingSubnetName": "ase-subnet-1", "existingResourceGroupName": "[resourceGroup().name]" }, "resources": [ @@ -43,10 +43,6 @@ "subnetName": { "type": "string", "value": "[variables('existingSubnetName')]" - }, - "resourceGroupName": { - "type": "string", - "value": "[variables('existingResourceGroupName')]" } } } From 2c5a40ea58f9dc6c56f94b56626cf47d905426cb Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 11:32:29 +0200 Subject: [PATCH 06/19] changes made to prereqs --- 201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json index f20edb2d1e85..3a7dc67a15d5 100644 --- a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -4,8 +4,7 @@ "parameters": {}, "variables": { "existingVirtualNetworkName": "existingvnet", - "existingSubnetName": "ase-subnet-1", - "existingResourceGroupName": "[resourceGroup().name]" + "existingSubnetName": "ase-subnet-1" }, "resources": [ { From ef6bc7adc7ed4adb7fa052e2ecef57596a76863c Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Fri, 6 Apr 2018 11:44:23 +0200 Subject: [PATCH 07/19] changes api version --- 201-asev2-ilb-with-web-app/azuredeploy.json | 8 ++++---- 201-asev2-ilb-with-web-app/azuredeploy.parameters.json | 2 +- .../prereqs/prereq.azuredeploy.json | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index 06b3497ebe45..f73a8af5d74f 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -80,7 +80,7 @@ }, "resources": [ { - "apiVersion": "2015-08-01", + "apiVersion": "2016-09-01", "type": "Microsoft.Web/hostingEnvironments", "name": "[parameters('aseName')]", "kind": "ASEV2", @@ -104,7 +104,7 @@ } }, { - "apiVersion": "2015-08-01", + "apiVersion": "2016-09-01", "name": "[parameters('appServicePlanName')]", "type": "Microsoft.Web/serverfarms", "location": "[parameters('aseLocation')]", @@ -132,7 +132,7 @@ ] }, { - "apiVersion": "2015-08-01", + "apiVersion": "2016-08-01", "name": "[parameters('siteName')]", "type": "Microsoft.Web/sites", "location": "[resourceGroup().location]", @@ -140,7 +140,7 @@ "displayName": "ASE Web App", "usage": "Web App Hosted within ASE", "category": "Web App", - "owner": "[parameters('owner')]" + "owner": "[parameters('owner')]" }, "properties": { "name": "[parameters('siteName')]", diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index 5e2b73b40012..5f7f0271e1d3 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -9,7 +9,7 @@ "value": "GET-PREREQ-existingVnetResourceId" }, "subnetName": { - "value": "GET-PREREQ-subnetName" + "value": "GET-PREREQ-existingSubnetName" }, "aseLocation": { "value": "West Europe" diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json index 3a7dc67a15d5..aa1739599daf 100644 --- a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -3,8 +3,8 @@ "contentVersion": "1.0.0.0", "parameters": {}, "variables": { - "existingVirtualNetworkName": "existingvnet", - "existingSubnetName": "ase-subnet-1" + "existingVirtualNetworkName": "vnet", + "existingSubnetName": "subnet-1" }, "resources": [ { @@ -39,7 +39,7 @@ "type": "string", "value": "[resourceId('Microsoft.Network/virtualNetworks/',variables('existingVirtualNetworkName'))]" }, - "subnetName": { + "existingSubnetName": { "type": "string", "value": "[variables('existingSubnetName')]" } From 28dfb698371d731904d0cedf9bbe39f4c3a169c8 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Tue, 17 Apr 2018 21:05:13 +0200 Subject: [PATCH 08/19] updated with requested changes --- 201-asev2-ilb-with-web-app/azuredeploy.json | 14 ++++++++++++-- .../azuredeploy.parameters.json | 6 ------ .../prereqs/prereq.azuredeploy.json | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index f73a8af5d74f..898a8a136d28 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -8,10 +8,16 @@ "description": "Name of the App Service Environment" } }, + "vnetResourceGroupName": { + "type": "string", + "metadata": { + "description": "The resource group name that contains the vnet" + } + }, "vnetResourceName": { "type": "string", "metadata": { - "description": "Name of the existing internal VNET" + "description": "The name of the vnet" } }, "subnetName": { @@ -22,6 +28,7 @@ }, "aseLocation": { "type": "string", + "defaultValue": "West Europe", "metadata": { "description": "Specific parameter used because the ASE api can't handle the resource group location" } @@ -78,6 +85,9 @@ } } }, + "variables": { + "vnetID": "[resourceId(parameters('vnetResourceGroupName'), 'Microsoft.Network/virtualNetworks', parameters('vnetResourceName'))]" + }, "resources": [ { "apiVersion": "2016-09-01", @@ -98,7 +108,7 @@ "internalLoadBalancingMode": "[parameters('internalLoadBalancingMode')]", "dnsSuffix": "[parameters('dnsSuffix')]", "virtualNetwork": { - "Id": "[parameters('vnetResourceName')]", + "Id": "[variables('vnetID')]", "Subnet": "[parameters('subnetName')]" } } diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index 5f7f0271e1d3..8018af3303de 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -11,9 +11,6 @@ "subnetName": { "value": "GET-PREREQ-existingSubnetName" }, - "aseLocation": { - "value": "West Europe" - }, "internalLoadBalancingMode": { "value": 3 }, @@ -26,9 +23,6 @@ "appServicePlanName": { "value": "GEN-UNIQUE" }, - "workerPool": { - "value": "1" - }, "owner": { "value": "Owner" } diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json index aa1739599daf..e46bc0ed48d1 100644 --- a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -10,7 +10,7 @@ { "type": "Microsoft.Network/virtualNetworks", "name": "[variables('existingVirtualNetworkName')]", - "apiVersion": "2016-03-30", + "apiVersion": "2018-02-01", "location": "West Europe", "comments": "Virtual network for overall solution", "tags": { From 79c7b0fe1c4feac7926c579553f514aad999c427 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Tue, 17 Apr 2018 21:12:29 +0200 Subject: [PATCH 09/19] azure deploy --- .../azuredeploy.parameters.json | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index 8018af3303de..d8946f831667 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -8,23 +8,26 @@ "vnetResourceName": { "value": "GET-PREREQ-existingVnetResourceId" }, - "subnetName": { - "value": "GET-PREREQ-existingSubnetName" + "vnetResourceGroupName": { + "value": "" }, - "internalLoadBalancingMode": { - "value": 3 - }, - "dnsSuffix": { - "value": "GEN-UNIQUE-10" - }, - "siteName": { - "value": "GEN-UNIQUE" - }, - "appServicePlanName": { - "value": "GEN-UNIQUE" - }, - "owner": { - "value": "Owner" + "subnetName": { + "value": "GET-PREREQ-existingSubnetName" + }, + "internalLoadBalancingMode": { + "value": 3 + }, + "dnsSuffix": { + "value": "GEN-UNIQUE-10" + }, + "siteName": { + "value": "GEN-UNIQUE" + }, + "appServicePlanName": { + "value": "GEN-UNIQUE" + }, + "owner": { + "value": "Owner" + } } - } } \ No newline at end of file From 94e2f2c3f42da37904874c90c13f410ff7b6208e Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Mon, 7 May 2018 13:44:15 +0200 Subject: [PATCH 10/19] updated ase --- .vs/slnx.sqlite | Bin 0 -> 73728 bytes 201-asev2-ilb-with-web-app/azuredeploy.json | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 .vs/slnx.sqlite diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..1ceaa0ade30dc233662692c106ee35b4d2fd35b4 GIT binary patch literal 73728 zcmeI5O>7&-6@Yg|ic3&xB3V+bAV^x8T-h5_B*h=uhDr!aawKg) zE@g5lTWv11>jX)Fwm^&K5abXPL4X3i^#|xV1%kFYwwDwIS_5qlL5l*t6hVN_?Eemz zvgDYCT|B~~v@>sJ-hA`k%)I?`aXq7GNZ4+*o3bV>GLsC;GT#&ghG9;cKlqpa;qiCS z{G0q@U4IYy^CXk_^4cg7=D#2^kMUoe*dJ?0KMsE$-r(LF4F}tSPnkQ+XM-yE3hAMV zkY4)s&NvraTx8$wYI3!KR+R=S9&|L+ETC=FMrzG3X(Ck+lO<6oCC_I>VbiBjWjs1F z9u@G%FIQAGMLUq{6+z0D#0z3U$QPuwWZ|lCNxUi~%cY!@#Z9b<*^-dW;h%CQGb@<& z<=d@&rH%L-{RBjWC)lEqXqEzX(^ zrO_Tz>$0km{@t}T2ZG%mokZF-dto+Q&Zh}Sv*9D?>*z-DpjmA-(r8;z6-{ZWTgIR24xuE~wQ^iXC50}f@l=KMr4vnG+% zZliIq-jy55wu0(@75IC}B|QEv6SgKnv&YF=4Rtz7RcYXPbg&p@UG{A23x}Q^hBIMg zS~Z!tTcLG*u-=wXs@3Q=)qXkR%_|WuCMMXMW4fcz%5UXmym)C_1UQ`+HO;e}mDbB5 zhNAm2E#SIJ{*9KTiO zbRU1C;%o$JvZ|tXO0Ml15M9S%uaE1hxUyY7PG`Bj^aws~E&Ft5-PL>*d-g24$6k*g z*wjNUY1DjBQktlv$<4irKsFR5X$`Ns=CXGt#KoSETaIEWOzPVrUsi&#YvFu-!;-NJ z+2&>Cn0p@V4pxexFg3Z^xf`h6!LvZ$N^_GPb*xHuLXKDUG`^X zxDDnQc4rkg`s2*~^LWp4_|$KewEKFL!gy-Cbr94&@y%x)Pt>>M1_jy?M!g*9Y!?YS z>mG^tEn;^=F=#S$mL#&pH&-{QLo}@j=Ox$n-^|O%9W7Vwp!Pn(>!V}r)=;Fy)nqwS z5^CMHz5r;JXPA|*<_e;8A*%-(*jNYY<%$p7Aq7qF{;rXD>{|gYwlKx^P8-`lq-lz} zkCucjTSzypY70-`^VrR~f@Msb^83@E#>pmOf z_LvdelT)mIqlSGy+T+1Mf=b#&p~pw8RM*`#;V2uJikNpHL~&g#|1SprgAWh@0zd!= z00AHX1b_e#00KY&2mk>f@c%(zGB6$S+yp@G{|`^xVfa7tzvSQHRsJ&n3jZWdfDaG= z0zd!=00AHX1b_e#00KY&2mpaci@-uS#H_QC&|VwA?d{r}{OxWV)zMy~buhOlxA8Om z8h%s9+-sedIvW1N&nMphd*|QJaUtd<{~{i_SSZAtjzmKEU2*9(ajsd{D|oZ;qbEi~ z%v2<7w%M`joeGASX)KT1l#bU4;(-v8!kLFCXo)^O5@HgRC{fJHpJ78xk_m^- z&Mze74%$DPP#V?5bw%4vTu0S}ytij*MB@Ju{>KdeJNyM7AOHk_01yBIKmZ5;0U!Vb zfB+Bx0zlva5?CAwGUaFH<%Rl-E9aIH)upAC!~#A@RO`$0iTU~Y`iqOz7tqpTZDDR< zZe@O9;f1+{Mf`|=`I(jN7tbv%pQ|R87hXV#rIi{=tSr{fCFWOTv~YI2x_I`S>?%a= z{~zJsW%zgb-#@?(LQ_Bh2mk>f00e*l5C8%|00;m9AOHk_0K+T=%g?aKjQ>X#aiPdD z<9~AfKg9o#;s441iT^GCEB-@#03RR#1b_e#00KY&2mk>f00e*l5C8%|VAupE@k0e{ zgbj@Z^qcfQ`tO&M_-O)?!Wk()`NpZo@Ph;_%Z4nWAAHiB#E%aUp|BzJy$|1?#7_y3 zl%SFF&foSY@pAzrC19q!nkLu(!~81@|5yG~{%8DqJi^caf1mFSyOU5q5C8%|00;m9 zAOHk_01yBIKmZ5;fk%hHbAfgC?ynUHPX%7`6C+RTbK`;2to{0c&{$x~lf00e*l5C8%|00<0+z)WzR^^52G-X{1|@FibC{T+hbMDTRP75bkD zPDSk4|737FLIwXqFctAc_f&I%CxQvDfFAxo9ZWKZ#Q)^}e`azxoS;@900e*l5C8%| z00;m9AOHk_01yBIK;YpZK(7Bo{Qq!_1!w^TfB+Bx0zd!=00AHX1b_e#00KZ@SOg&c z9~N1t7YG0WAOHk_01yBIKmZ5;0U!VbfWX5;0Pg>Pc*X)W0Rlh(2mk>f00e*l5C8%| z00;m9ATTTf5dRO0EYu4GfB+Bx0zd!=00AHX1b_e#00KbZ;UPfc|LAC#;g=`wOteqz zkF}#8hd&Q*aPN(VgYCel%pK;lA!r+#2zrk%ePzmN*%S`#VsMBAg+o9F`E*L z!lor?v{sq16L876Q5jJ%mle`tM#SAoC5x$KTAVc-N~1lb)@4;A{kv;x4g|YBI*GJv z_QGtqoKF*uX2VC&$ulY*oiHL#@9D;I|LLUrtxsOob}K?jykd-)kjiB;qyxesGn?K< zEAif`F)o(EN~Zjk%*svVuiA;bsOFSBR3Rc(p#~y;dos$!5()OLqCQE`-KLMnywd}n z?V20tEVo4;VM;I^)pB%q>7mRB1{}(8&H0I9W=$fi-A3bJy(>4AZ3Wf+D)9G`OL+WU zCTvZDW{;D#8tQbEs?xyo=wLC*y6oB37Y;o;3}?c~v}!VOw?gasV7)D&RIAZ#s{L}r zn^z)SOiZvh$8<-bmEX$Cc=6J<2yi+tYMN&`E3KDB3`O^4TFPC6?J=|vabZ7?nZ>J* zt^i$tOu4;NVYiRdBD&6okJDKZuaDE&u9C;rIDV_l=|28O#n}kdWK~7&lw8|2Ai9pj zULV(0ab>%FoX&E4=@ER~TK4JAx~usr_Uu`7kG&p0u&IYy(x~~Mq%=`Slbd@Lfov#B z(i&cM&1LUQh>JZRw;aV%nAEpLzN`de*TVVwh9zScvdzoNG50*!9jp{XVQO--b2m`C zgJ*%hmF6Zp%EjVw_SVa~6maCm;+xMpo~Uoh4GOd)jCwiH*)9@v);$vOTg2{$V$fvhEJXsd&+bxGt$9R@sxMrF>Zc%_}iCF8w|EEk)aVsGx~b(#v8 zzeYTDY+Bkm(W061;7oHvZgjD&IlgH{BX~4O{2v}O?1v*cVJLA#IQt2W-m6j?O ziqeMIFOw{qr#8t+ydpkzm?{bM#z3kI$)a#x?wDs&jjfwhpA`meIf#79*t8fTP7$)< z@?>kf!fGM6*4L^N%i!2Hmvs&eEuCYcd4A4EJ+H`Waqjr)_En*)|N85~^tYx3{3}0a zcN6!+-D_>vDQonP8cHIacVwh&7N0tP6`w5bBS9ori}>8GBaJ)bGfFSJ^&vY(3p-i< zqt@sa=e|Bm>D{pnV?278vPV%8t2#)x{xQM^dJ&)F_BR$mD(Zn>?+nkyuEyD(Or0J{ z%bL8^&p{6bon#_)(!0m>W)7;t-gkP%$@bGpu@F~gH}$A0{@uL^J?eXFii&uM9!@!O z#Ctc8-b~+Ehm^Xp-fq5bi%fE+*Oy@%M) z+<@Dc4Xj=c@j3zaZMg0Q*S*Lph(8#_vCsQ?uEW7~FYkp0f00e*l5EveT{{bPU<*)z% literal 0 HcmV?d00001 diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index 898a8a136d28..2ea8cb3035d5 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -124,6 +124,9 @@ "category": "Hosting", "owner": "[parameters('owner')]" }, + "dependsOn": [ + "[concat('Microsoft.Web/hostingEnvironments/',parameters('aseName'))]" + ], "properties": { "name": "[parameters('appServicePlanName')]", "hostingEnvironmentProfile": { @@ -136,10 +139,7 @@ "size": "[concat('I',parameters('workerPool'))]", "family": "I", "capacity": "[parameters('numberOfWorkersFromWorkerPool')]" - }, - "dependsOn": [ - "[concat('Microsoft.Web/hostingEnvironments/',parameters('aseName'))]" - ] + } }, { "apiVersion": "2016-08-01", @@ -152,16 +152,16 @@ "category": "Web App", "owner": "[parameters('owner')]" }, + "dependsOn": [ + "[concat('Microsoft.Web/serverFarms/',parameters('appServicePlanName'))]" + ], "properties": { "name": "[parameters('siteName')]", "serverFarmId": "[resourceId('Microsoft.Web/serverFarms',parameters('appServicePlanName'))]", "hostingEnvironmentProfile": { "id": "[resourceId('Microsoft.Web/hostingEnvironments/', parameters('aseName'))]" } - }, - "dependsOn": [ - "[concat('Microsoft.Web/serverFarms/',parameters('appServicePlanName'))]" - ] + } } ] } \ No newline at end of file From 46f32bfeaeab5641b9b80dd68acb2e8224acb8a5 Mon Sep 17 00:00:00 2001 From: Maik van der Gaag Date: Mon, 7 May 2018 14:16:32 +0200 Subject: [PATCH 11/19] remove --- .vs/slnx.sqlite | Bin 73728 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .vs/slnx.sqlite diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index 1ceaa0ade30dc233662692c106ee35b4d2fd35b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73728 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 From af7ff4555f47e9ad767f7df5401b6d9698df75f7 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 15:40:51 -0500 Subject: [PATCH 12/19] using existing vnet --- .../azuredeploy.parameters.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index d8946f831667..fbd3ce946e7c 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -6,16 +6,13 @@ "value": "GEN-UNIQUE" }, "vnetResourceName": { - "value": "GET-PREREQ-existingVnetResourceId" + "value": "GEN-VNET-NAME" }, "vnetResourceGroupName": { - "value": "" + "value": "GEN-VNET-RESOURCEGROUP-NAME" }, "subnetName": { - "value": "GET-PREREQ-existingSubnetName" - }, - "internalLoadBalancingMode": { - "value": 3 + "value": "GEN-SUBNET1-NAME" }, "dnsSuffix": { "value": "GEN-UNIQUE-10" @@ -30,4 +27,4 @@ "value": "Owner" } } -} \ No newline at end of file +} From e8f3e606eb0df9f647fb770241a9716e650dbd81 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 15:41:28 -0500 Subject: [PATCH 13/19] added schema property --- 201-asev2-ilb-with-web-app/metadata.json | 1 + 1 file changed, 1 insertion(+) diff --git a/201-asev2-ilb-with-web-app/metadata.json b/201-asev2-ilb-with-web-app/metadata.json index f62c0c0b5b95..b0650bb0ed72 100644 --- a/201-asev2-ilb-with-web-app/metadata.json +++ b/201-asev2-ilb-with-web-app/metadata.json @@ -1,4 +1,5 @@ { + "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#", "itemDisplayName": "App Service Environment with Hosting Plan and Azure WebApp", "description": "Creates an App Service Environment v2 with an ILB Address in a existing virtual network that will be privately availible. The App Service Environment will contain a Hosting Plan and a Azure Web App", "summary": "App Service Environment v2 - ILB with Hosting Plan and Azure WebApp", From 7ff1072bc8a708d6e85a4b589cca0e56a0396c60 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 15:52:03 -0500 Subject: [PATCH 14/19] updating location --- 201-asev2-ilb-with-web-app/azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index 2ea8cb3035d5..c79e57914f79 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -28,7 +28,7 @@ }, "aseLocation": { "type": "string", - "defaultValue": "West Europe", + "defaultValue": "[resourceGroup().location]", "metadata": { "description": "Specific parameter used because the ASE api can't handle the resource group location" } @@ -164,4 +164,4 @@ } } ] -} \ No newline at end of file +} From 3f9c9d17cb01baf6cb38bdab8dc94dfafb70de40 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 15:57:57 -0500 Subject: [PATCH 15/19] fix gen value --- 201-asev2-ilb-with-web-app/azuredeploy.parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index fbd3ce946e7c..09eeef2e3920 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -12,7 +12,7 @@ "value": "GEN-VNET-RESOURCEGROUP-NAME" }, "subnetName": { - "value": "GEN-SUBNET1-NAME" + "value": "GEN-VNET-SUBNET1-NAME" }, "dnsSuffix": { "value": "GEN-UNIQUE-10" From c1579b5fa115681c6a5e918371179762acaba5fe Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 16:32:54 -0500 Subject: [PATCH 16/19] roll back to prereqs --- 201-asev2-ilb-with-web-app/azuredeploy.parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json index 09eeef2e3920..dd90f30df15b 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.parameters.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.parameters.json @@ -6,13 +6,13 @@ "value": "GEN-UNIQUE" }, "vnetResourceName": { - "value": "GEN-VNET-NAME" + "value": "GET-PREREQ-existingVnetName" }, "vnetResourceGroupName": { "value": "GEN-VNET-RESOURCEGROUP-NAME" }, "subnetName": { - "value": "GEN-VNET-SUBNET1-NAME" + "value": "GET-PREREQ-existingSubnetName" }, "dnsSuffix": { "value": "GEN-UNIQUE-10" From 2cf2f22f50619139c25b5e8b4a5813017960359b Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 16:33:26 -0500 Subject: [PATCH 17/19] fix output value --- 201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json index e46bc0ed48d1..2f5d4bb8fe93 100644 --- a/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json +++ b/201-asev2-ilb-with-web-app/prereqs/prereq.azuredeploy.json @@ -35,9 +35,9 @@ } ], "outputs": { - "existingVnetResourceId": { + "existingVnetName": { "type": "string", - "value": "[resourceId('Microsoft.Network/virtualNetworks/',variables('existingVirtualNetworkName'))]" + "value": "[variables('existingVirtualNetworkName')]" }, "existingSubnetName": { "type": "string", From 81ac3c7ae68c5e7b9d5450ddd189563492f86e5b Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Mon, 4 Jun 2018 16:35:19 -0500 Subject: [PATCH 18/19] hardcode location --- 201-asev2-ilb-with-web-app/azuredeploy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index c79e57914f79..cc5fa1a5c357 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -28,7 +28,7 @@ }, "aseLocation": { "type": "string", - "defaultValue": "[resourceGroup().location]", + "defaultValue": "westeurope", "metadata": { "description": "Specific parameter used because the ASE api can't handle the resource group location" } From 601f09b4f39cdbb80fef693e4f4ec68f01cc9da5 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Thu, 7 Jun 2018 18:57:50 -0500 Subject: [PATCH 19/19] seriously? --- 201-asev2-ilb-with-web-app/azuredeploy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/201-asev2-ilb-with-web-app/azuredeploy.json b/201-asev2-ilb-with-web-app/azuredeploy.json index cc5fa1a5c357..dc053202e5dd 100644 --- a/201-asev2-ilb-with-web-app/azuredeploy.json +++ b/201-asev2-ilb-with-web-app/azuredeploy.json @@ -28,7 +28,7 @@ }, "aseLocation": { "type": "string", - "defaultValue": "westeurope", + "defaultValue": "West US", "metadata": { "description": "Specific parameter used because the ASE api can't handle the resource group location" }