From ff5affebc19df71767838408cd432008848171de Mon Sep 17 00:00:00 2001 From: Sacha Narinx Date: Tue, 10 Oct 2023 11:04:17 +0400 Subject: [PATCH 1/3] Fix IP address space --- eslzArm/eslz-portal.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json index efd1235f2a..c9c61267d2 100644 --- a/eslzArm/eslz-portal.json +++ b/eslzArm/eslz-portal.json @@ -1925,7 +1925,7 @@ "type": "Microsoft.Common.TextBox", "label": "Subnet for Azure Firewall Mgmt (Optional Only for Basic SKU)", "toolTip": "Provide address prefix in CIDR notation (e.g 10.100.0.0/26)", - "defaultValue": "10.100.1.0/26", + "defaultValue": "10.100.2.0/24", "visible": "[and(equals(steps('connectivity').enableAzFw, 'Yes'), equals(steps('connectivity').firewallSku, 'Basic'), not(equals(steps('connectivity').enableHub, 'vwan')))]", "constraints": { "required": true, From fff222dba01709776cebfc9229bcad958fe330d0 Mon Sep 17 00:00:00 2001 From: Sacha Narinx Date: Tue, 10 Oct 2023 11:23:31 +0400 Subject: [PATCH 2/3] Whats New --- docs/wiki/Whats-new.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md index fcd76cd464..37d7c82ff8 100644 --- a/docs/wiki/Whats-new.md +++ b/docs/wiki/Whats-new.md @@ -45,6 +45,9 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones: - The portal accelerator experience has been updated to include deployment of Azure Monitor baseline alerts. Details on the policies deployed can be found [here](https://aka.ms/amba/alz). +#### Tooling + +- Fixed a bug in the portal accelerator experience when deploying a VPN Gateway and Azure Firewall (Basic SKU) - IP address overlap error. ### September 2023 From f8c946f847e4f752b36b5ceeeb76d50c06025e86 Mon Sep 17 00:00:00 2001 From: Sacha Narinx Date: Tue, 17 Oct 2023 10:23:22 +0400 Subject: [PATCH 3/3] Adding FW dependency on VPN Gateway --- eslzArm/subscriptionTemplates/hubspoke-connectivity.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eslzArm/subscriptionTemplates/hubspoke-connectivity.json b/eslzArm/subscriptionTemplates/hubspoke-connectivity.json index 9a0068fcd5..62e4c32f2f 100644 --- a/eslzArm/subscriptionTemplates/hubspoke-connectivity.json +++ b/eslzArm/subscriptionTemplates/hubspoke-connectivity.json @@ -548,7 +548,8 @@ "dependsOn": [ "[concat('Microsoft.Network/firewallPolicies/', variables('azFwPolicyName'))]", "[concat('Microsoft.Network/publicIpAddresses/', variables('azFwIpName'))]", - "[concat('Microsoft.Network/virtualNetworks/', variables('hubName'))]" + "[concat('Microsoft.Network/virtualNetworks/', variables('hubName'))]", + "[concat('Microsoft.Network/virtualNetworkGateways/', variables('vpngwname'))]" ], "properties": { "sku": {