|
210 | 210 | "metadata": { |
211 | 211 | "description": "Set to false to skip subnet creation (useful when subnets already exist)" |
212 | 212 | } |
| 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 | + } |
213 | 220 | } |
214 | 221 | }, |
215 | 222 | "resources": [ |
|
399 | 406 | "dependsOn": [ |
400 | 407 | "[resourceId('Microsoft.Network/privateDnsZones/virtualNetworkLinks', parameters('privateDnsZoneNameForDb'), format('{0}-vnetlink', parameters('privateDnsZoneNameForDb')))]", |
401 | 408 | "[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'))]" |
403 | 410 | ], |
404 | 411 | "identity": { |
405 | 412 | "type": "UserAssigned", |
|
538 | 545 | "type": "Microsoft.Resources/deployments", |
539 | 546 | "name": "subnet_Resources", |
540 | 547 | "apiVersion": "[variables('resourceDeploymentApiVersion')]", |
541 | | - "condition": "[parameters('createSubnets')]", |
| 548 | + "condition": "[or(not(parameters('useExistingVnet')), parameters('createSubnets'))]", |
542 | 549 | "dependsOn": [ |
543 | 550 | ], |
544 | 551 | "properties": { |
|
608 | 615 | "apiVersion": "2021-03-01", |
609 | 616 | "name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]", |
610 | 617 | "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]", |
612 | 619 | "delegations": [ |
613 | 620 | { |
614 | 621 | "name": "dlg-appService", |
|
624 | 631 | "apiVersion": "2021-03-01", |
625 | 632 | "name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]", |
626 | 633 | "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]", |
628 | 635 | "delegations": [ |
629 | 636 | { |
630 | 637 | "name": "dlg-mysql", |
|
669 | 676 | ], |
670 | 677 | "dependsOn": [ |
671 | 678 | "[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'))]" |
673 | 680 | ] |
674 | 681 | }, |
675 | 682 | { |
|
716 | 723 | "properties": { |
717 | 724 | "clientAffinityEnabled": false, |
718 | 725 | "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'))]", |
720 | 727 | "siteConfig": { |
721 | 728 | "appSettings": [ |
722 | 729 | { |
|
0 commit comments