Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portal RI: Fix IP address space overlap with FW/VPN #1443

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Portal RI: Fix IP address space overlap with FW/VPN #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff5affe
Fix IP address space
Springstone Oct 10, 2023
fff222d
Whats New
Springstone Oct 10, 2023
f8c946f
Adding FW dependency on VPN Gateway
Springstone Oct 17, 2023
c87e75f
Merge branch 'main' into GH1427
Springstone Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/wiki/Whats-new.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:

#### Tooling

- Fixed a bug in the portal accelerator experience when deploying a VPN Gateway and Azure Firewall (Basic SKU) - IP address overlap error.
- Added vWAN Hub Routing Intent support to Portal Accelerator for scenarios that include Azure Firewall deployment
- Enhanced the ALZ Portal Accelerator to provide the ability to deploy the Azure VPN Gateway in Active/Active mode as per feedback from [#655](https://github.com/Azure/Enterprise-Scale/issues/655).

Expand Down
2 changes: 1 addition & 1 deletion eslzArm/eslz-portal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion eslzArm/subscriptionTemplates/hubspoke-connectivity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Loading