Skip to content

Commit 01b03e6

Browse files
author
Keshava Kandikonda
committed
Add vnetresourceGroup parameter
1 parent 7311673 commit 01b03e6

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

ARM_Template_Create_WP/azuredeploy.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,13 @@
210210
"metadata": {
211211
"description": "Set to false to skip subnet creation (useful when subnets already exist)"
212212
}
213+
},
214+
"vnetResourceGroup": {
215+
"type": "string",
216+
"defaultValue": "[parameters('serverFarmResourceGroup')]",
217+
"metadata": {
218+
"description": "Resource group where the VNet is located. Defaults to serverFarmResourceGroup."
219+
}
213220
}
214221
},
215222
"resources": [
@@ -399,7 +406,7 @@
399406
"dependsOn": [
400407
"[resourceId('Microsoft.Network/privateDnsZones/virtualNetworkLinks', parameters('privateDnsZoneNameForDb'), format('{0}-vnetlink', parameters('privateDnsZoneNameForDb')))]",
401408
"[concat('Microsoft.ManagedIdentity/userAssignedIdentities/', parameters('managedIdentityName'))]",
402-
"[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'add_delegations'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]"
409+
"[if(or(not(parameters('useExistingVnet')), parameters('createSubnets')), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), resourceId('Microsoft.Resources/deployments', 'add_delegations'))]"
403410
],
404411
"identity": {
405412
"type": "UserAssigned",
@@ -538,7 +545,7 @@
538545
"type": "Microsoft.Resources/deployments",
539546
"name": "subnet_Resources",
540547
"apiVersion": "[variables('resourceDeploymentApiVersion')]",
541-
"condition": "[parameters('createSubnets')]",
548+
"condition": "[or(not(parameters('useExistingVnet')), parameters('createSubnets'))]",
542549
"dependsOn": [
543550
],
544551
"properties": {
@@ -608,7 +615,7 @@
608615
"apiVersion": "2021-03-01",
609616
"name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]",
610617
"properties": {
611-
"addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForApp')), '2021-03-01').addressPrefix]",
618+
"addressPrefix": "[reference(resourceId(parameters('vnetResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForApp')), '2021-03-01').addressPrefix]",
612619
"delegations": [
613620
{
614621
"name": "dlg-appService",
@@ -624,7 +631,7 @@
624631
"apiVersion": "2021-03-01",
625632
"name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]",
626633
"properties": {
627-
"addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForDb')), '2021-03-01').addressPrefix]",
634+
"addressPrefix": "[reference(resourceId(parameters('vnetResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForDb')), '2021-03-01').addressPrefix]",
628635
"delegations": [
629636
{
630637
"name": "dlg-mysql",
@@ -669,7 +676,7 @@
669676
],
670677
"dependsOn": [
671678
"[resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))]",
672-
"[if(parameters('createSubnets'), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), if(parameters('useExistingVnet'), resourceId('Microsoft.Resources/deployments', 'add_delegations'), resourceId('Microsoft.Network/virtualNetworks/', parameters('vnetName'))))]"
679+
"[if(or(not(parameters('useExistingVnet')), parameters('createSubnets')), resourceId('Microsoft.Resources/deployments', 'subnet_Resources'), resourceId('Microsoft.Resources/deployments', 'add_delegations'))]"
673680
]
674681
},
675682
{
@@ -716,7 +723,7 @@
716723
"properties": {
717724
"clientAffinityEnabled": false,
718725
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', parameters('hostingPlanName'))]",
719-
"virtualNetworkSubnetId": "[concat('/subscriptions/', parameters('subscriptionId'),'/resourcegroups/', parameters('serverFarmResourceGroup'), '/providers/Microsoft.Network/virtualNetworks/', parameters('vnetName'), '/subnets/', parameters('subnetForApp'))]",
726+
"virtualNetworkSubnetId": "[concat('/subscriptions/', parameters('subscriptionId'),'/resourcegroups/', parameters('vnetResourceGroup'), '/providers/Microsoft.Network/virtualNetworks/', parameters('vnetName'), '/subnets/', parameters('subnetForApp'))]",
720727
"siteConfig": {
721728
"appSettings": [
722729
{

ARM_Template_Create_WP/azuredeploy.parameters.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,8 @@
203203
"createSubnets": {
204204
"value": true
205205
},
206-
"subnetAddressForApp": {
207-
"value": "10.0.0.0/24"
208-
},
209-
"subnetAddressForDb": {
210-
"value": "10.0.1.0/24"
206+
"vnetResourceGroup": {
207+
"value": null
211208
}
212209
}
213210
}

0 commit comments

Comments
 (0)