|
211 | 211 | "description": "Set to false to skip subnet creation (useful when subnets already exist)" |
212 | 212 | } |
213 | 213 | }, |
214 | | - "vnetAddressPrefix": { |
215 | | - "type": "string", |
216 | | - "defaultValue": "10.0.0.0/16", |
217 | | - "metadata": { |
218 | | - "description": "Address space for the VNet (e.g., 10.0.0.0/16)" |
219 | | - } |
220 | | - }, |
221 | 214 | "subnetAddressForApp": { |
222 | 215 | "type": "string", |
223 | 216 | "defaultValue": "10.0.0.0/24", |
224 | 217 | "metadata": { |
225 | | - "description": "Address prefix for the App Service subnet (e.g., 10.0.0.0/24)" |
| 218 | + "description": "Address prefix for the App Service subnet when creating new subnets (createSubnets=true). When using existing subnets (createSubnets=false), this parameter is ignored and the existing subnet's address range is preserved. Example: 10.0.0.0/24" |
226 | 219 | } |
227 | 220 | }, |
228 | 221 | "subnetAddressForDb": { |
229 | 222 | "type": "string", |
230 | 223 | "defaultValue": "10.0.1.0/24", |
231 | 224 | "metadata": { |
232 | | - "description": "Address prefix for the Database subnet (e.g., 10.0.1.0/24)" |
233 | | - } |
234 | | - }, |
235 | | - "useExistingPrivateDnsZone": { |
236 | | - "type": "bool", |
237 | | - "defaultValue": false, |
238 | | - "metadata": { |
239 | | - "description": "Set to true to use an existing Private DNS Zone instead of creating a new one" |
| 225 | + "description": "Address prefix for the Database subnet when creating new subnets (createSubnets=true). When using existing subnets (createSubnets=false), this parameter is ignored and the existing subnet's address range is preserved. Example: 10.0.1.0/24" |
240 | 226 | } |
241 | 227 | } |
242 | 228 | }, |
|
555 | 541 | "properties": { |
556 | 542 | "addressSpace": { |
557 | 543 | "addressPrefixes": [ |
558 | | - "[parameters('vnetAddressPrefix')]" |
| 544 | + "[variables('vnetAddress')]" |
559 | 545 | ] |
560 | 546 | }, |
561 | 547 | "subnets": [] |
|
569 | 555 | "condition": "[parameters('createSubnets')]", |
570 | 556 | "dependsOn": [ |
571 | 557 | ], |
572 | | - "resourceGroup": "[parameters('serverFarmResourceGroup')]", |
573 | | - "subscriptionId": "[subscription().subscriptionId]", |
574 | 558 | "properties": { |
575 | 559 | "mode": "Incremental", |
576 | 560 | "template": { |
|
625 | 609 | "condition": "[and(parameters('useExistingVnet'), not(parameters('createSubnets')))]", |
626 | 610 | "dependsOn": [ |
627 | 611 | ], |
628 | | - "resourceGroup": "[parameters('serverFarmResourceGroup')]", |
629 | | - "subscriptionId": "[subscription().subscriptionId]", |
630 | 612 | "properties": { |
631 | 613 | "mode": "Incremental", |
632 | 614 | "template": { |
|
640 | 622 | "apiVersion": "2021-03-01", |
641 | 623 | "name": "[format('{0}/{1}', parameters('vnetName'), parameters('subnetForApp'))]", |
642 | 624 | "properties": { |
643 | | - "addressPrefix": "[parameters('subnetAddressForApp')]", |
| 625 | + "addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForApp')), '2021-03-01').addressPrefix]", |
644 | 626 | "delegations": [ |
645 | 627 | { |
646 | 628 | "name": "dlg-appService", |
|
656 | 638 | "apiVersion": "2021-03-01", |
657 | 639 | "name": "[format('{0}/{1}',parameters('vnetName'), parameters('subnetForDb'))]", |
658 | 640 | "properties": { |
659 | | - "addressPrefix": "[parameters('subnetAddressForDb')]", |
| 641 | + "addressPrefix": "[reference(resourceId(parameters('serverFarmResourceGroup'), 'Microsoft.Network/virtualNetworks/subnets', parameters('vnetName'), parameters('subnetForDb')), '2021-03-01').addressPrefix]", |
660 | 642 | "delegations": [ |
661 | 643 | { |
662 | 644 | "name": "dlg-mysql", |
|
1163 | 1145 | "databaseVersion": "8.0.21", |
1164 | 1146 | "vnetDeploymentApiVersion": "2020-07-01", |
1165 | 1147 | "privateDnsApiVersion": "2018-09-01", |
| 1148 | + "vnetAddress": "10.0.0.0/23", |
1166 | 1149 | "blobApiVersion": "2021-08-01", |
1167 | 1150 | "storageAccountId": "[resourceId(parameters('storageAccountResourceGroup'),'Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]", |
1168 | 1151 | "emailApiVersion": "2023-03-31", |
|
0 commit comments