diff --git a/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking-multiRegion.bicep.md b/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking-multiRegion.bicep.md index f06180266..3cbf8420d 100644 --- a/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking-multiRegion.bicep.md +++ b/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking-multiRegion.bicep.md @@ -735,7 +735,7 @@ Switch to enable/disable VPN virtual network gateway deployment in secondary loc Configuration for VPN virtual network gateway to be deployed. -- Default value: `@{name=[format('{0}-Vpn-Gateway-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=}` +- Default value: `@{name=[format('{0}-Vpn-Gateway-{1}', parameters('parCompanyPrefix'), parameters('parLocation'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parVpnGatewayConfigSecondaryLocation @@ -743,7 +743,7 @@ Configuration for VPN virtual network gateway to be deployed. Configuration for VPN virtual network gateway to be deployed in secondary location. -- Default value: `@{name=[format('{0}-Vpn-Gateway-{1}', parameters('parCompanyPrefix'), parameters('parSecondaryLocation'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=}` +- Default value: `@{name=[format('{0}-Vpn-Gateway-{1}', parameters('parCompanyPrefix'), parameters('parSecondaryLocation'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parExpressRouteGatewayEnabled @@ -767,7 +767,7 @@ Switch to enable/disable ExpressRoute virtual network gateway deployment in seco Configuration for ExpressRoute virtual network gateway to be deployed. -- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=}` +- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parExpressRouteGatewayConfigSecondaryLocation @@ -775,7 +775,7 @@ Configuration for ExpressRoute virtual network gateway to be deployed. Configuration for ExpressRoute virtual network gateway to be deployed in secondary location. -- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=}` +- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parVirtualNetworkGatewayLock @@ -1173,7 +1173,9 @@ outBastionNsgNameSecondaryLocation | string | "bgpPeeringAddress": "", "peerWeight": 5 }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parVpnGatewayConfigSecondaryLocation": { @@ -1193,7 +1195,9 @@ outBastionNsgNameSecondaryLocation | string | "bgpPeeringAddress": "", "peerWeight": 5 }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -1218,7 +1222,9 @@ outBastionNsgNameSecondaryLocation | string | "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayConfigSecondaryLocation": { @@ -1237,7 +1243,9 @@ outBastionNsgNameSecondaryLocation | string | "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parVirtualNetworkGatewayLock": { diff --git a/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking.bicep.md b/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking.bicep.md index bd7acda70..bc13b6d65 100644 --- a/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking.bicep.md +++ b/infra-as-code/bicep/modules/hubNetworking/generateddocs/hubNetworking.bicep.md @@ -454,7 +454,7 @@ Switch to enable/disable VPN virtual network gateway deployment. Configuration for VPN virtual network gateway to be deployed. -- Default value: `@{name=[format('{0}-Vpn-Gateway', parameters('parCompanyPrefix'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=}` +- Default value: `@{name=[format('{0}-Vpn-Gateway', parameters('parCompanyPrefix'))]; gatewayType=Vpn; sku=VpnGw1; vpnType=RouteBased; generation=Generation1; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; vpnClientConfiguration=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parExpressRouteGatewayEnabled @@ -470,7 +470,7 @@ Switch to enable/disable ExpressRoute virtual network gateway deployment. Configuration for ExpressRoute virtual network gateway to be deployed. -- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=}` +- Default value: `@{name=[format('{0}-ExpressRoute-Gateway', parameters('parCompanyPrefix'))]; gatewayType=ExpressRoute; sku=ErGw1AZ; vpnType=RouteBased; vpnGatewayGeneration=None; enableBgp=False; activeActive=False; enableBgpRouteTranslationForNat=False; enableDnsForwarding=False; bgpPeeringAddress=; bgpsettings=; ipConfigurationName=vnetGatewayConfig; ipConfigurationActiveActiveName=vnetGatewayConfig2}` ### parVirtualNetworkGatewayLock @@ -733,7 +733,9 @@ outBastionNsgName | string | "bgpPeeringAddress": "", "peerWeight": 5 }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -755,7 +757,9 @@ outBastionNsgName | string | "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parVirtualNetworkGatewayLock": { diff --git a/infra-as-code/bicep/modules/hubNetworking/hubNetworking-multiRegion.bicep b/infra-as-code/bicep/modules/hubNetworking/hubNetworking-multiRegion.bicep index 71f617086..6a0aa8163 100644 --- a/infra-as-code/bicep/modules/hubNetworking/hubNetworking-multiRegion.bicep +++ b/infra-as-code/bicep/modules/hubNetworking/hubNetworking-multiRegion.bicep @@ -454,6 +454,8 @@ param parVpnGatewayConfig object = { peerWeight: 5 } vpnClientConfiguration: {} + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } //ASN must be 65515 if deploying VPN & ER for co-existence to work: https://docs.microsoft.com/en-us/azure/expressroute/expressroute-howto-coexist-resource-manager#limits-and-limitations @@ -475,6 +477,8 @@ param parVpnGatewayConfigSecondaryLocation object = { peerWeight: 5 } vpnClientConfiguration: {} + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } @sys.description('Switch to enable/disable ExpressRoute virtual network gateway deployment.') @@ -500,6 +504,8 @@ param parExpressRouteGatewayConfig object = { bgpPeeringAddress: '' peerWeight: '5' } + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } @sys.description('Configuration for ExpressRoute virtual network gateway to be deployed in secondary location.') @@ -519,6 +525,8 @@ param parExpressRouteGatewayConfigSecondaryLocation object = { bgpPeeringAddress: '' peerWeight: '5' } + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } @sys.description('''Resource Lock Configuration for ExpressRoute Virtual Network Gateway. @@ -1422,7 +1430,7 @@ resource resGateway 'Microsoft.Network/virtualNetworkGateways@2024-01-01' = [ [ { id: resHubVnet.id - name: 'vnetGatewayConfig1' + name: gateway.ipConfigurationName properties: { publicIPAddress: { id: modGatewayPublicIp[i].outputs.outPublicIpId // Primary Public IP @@ -1438,7 +1446,7 @@ resource resGateway 'Microsoft.Network/virtualNetworkGateways@2024-01-01' = [ ? [ { id: resHubVnet.id - name: 'vnetGatewayConfig2' + name: gateway.ipConfigurationActiveActiveName properties: { publicIPAddress: { id: modGatewayPublicIpActiveActive[i].outputs.outPublicIpId // Secondary Public IP @@ -1492,7 +1500,7 @@ resource resGatewaySecondaryLocation 'Microsoft.Network/virtualNetworkGateways@2 [ { id: resHubVnetSecondaryLocation.id - name: 'vnetGatewayConfig1' + name: gateway.ipConfigurationName properties: { publicIPAddress: { id: modGatewayPublicIpSecondaryLocation[i].outputs.outPublicIpId // Primary Public IP @@ -1508,7 +1516,7 @@ resource resGatewaySecondaryLocation 'Microsoft.Network/virtualNetworkGateways@2 ? [ { id: resHubVnetSecondaryLocation.id - name: 'vnetGatewayConfig2' + name: gateway.ipConfigurationActiveActiveName properties: { publicIPAddress: { id: modGatewayPublicIpActiveActiveSecondaryLocation[i].outputs.outPublicIpId // Secondary Public IP diff --git a/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep b/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep index 05d0a130d..e383a279e 100644 --- a/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep +++ b/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep @@ -301,6 +301,8 @@ param parVpnGatewayConfig object = { peerWeight: 5 } vpnClientConfiguration: {} + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } @sys.description('Switch to enable/disable ExpressRoute virtual network gateway deployment.') @@ -323,6 +325,8 @@ param parExpressRouteGatewayConfig object = { bgpPeeringAddress: '' peerWeight: '5' } + ipConfigurationName: 'vnetGatewayConfig' + ipConfigurationActiveActiveName: 'vnetGatewayConfig2' } @sys.description('''Resource Lock Configuration for ExpressRoute Virtual Network Gateway. @@ -791,7 +795,7 @@ resource resGateway 'Microsoft.Network/virtualNetworkGateways@2024-01-01' = [ [ { id: resHubVnet.id - name: 'vnetGatewayConfig1' + name: gateway.ipConfigurationName properties: { publicIPAddress: { id: modGatewayPublicIp[i].outputs.outPublicIpId // Primary Public IP @@ -807,7 +811,7 @@ resource resGateway 'Microsoft.Network/virtualNetworkGateways@2024-01-01' = [ ? [ { id: resHubVnet.id - name: 'vnetGatewayConfig2' + name: gateway.ipConfigurationActiveActiveName properties: { publicIPAddress: { id: modGatewayPublicIpActiveActive[i].outputs.outPublicIpId // Secondary Public IP diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json index 5e93eb89d..79ab5161e 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.all.json @@ -137,7 +137,9 @@ "bgpPeeringAddress": "", "peerWeight": "5" }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -159,7 +161,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parTags": { diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.all.json b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.all.json index ec30bd6ca..8508b72ce 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.all.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.all.json @@ -149,7 +149,9 @@ "bgpPeeringAddress": "", "peerWeight": "5" }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -171,7 +173,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parTags": { diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.multiRegion.all.json b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.multiRegion.all.json index b4ca1f4de..6110e1d32 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.multiRegion.all.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.az.multiRegion.all.json @@ -264,7 +264,9 @@ "bgpPeeringAddress": "", "peerWeight": "5" }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parVpnGatewayConfigSecondaryLocation": { @@ -284,7 +286,9 @@ "bgpPeeringAddress": "", "peerWeight": "5" }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -306,7 +310,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabledSecondaryLocation": { diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.min.json b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.min.json index c59fbe5df..898bf0c01 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.min.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/hubNetworking.parameters.min.json @@ -94,7 +94,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -116,7 +118,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parTelemetryOptOut": { diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.all.json b/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.all.json index 7fe471466..3c1ce5f83 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.all.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.all.json @@ -170,7 +170,9 @@ "bgpPeeringAddress": "", "peerWeight": "5" }, - "vpnClientConfiguration": {} + "vpnClientConfiguration": {}, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -192,7 +194,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parTags": { diff --git a/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.min.json b/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.min.json index 463ae0dcc..d268f6879 100644 --- a/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.min.json +++ b/infra-as-code/bicep/modules/hubNetworking/parameters/mc-hubNetworking.parameters.min.json @@ -130,7 +130,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parExpressRouteGatewayEnabled": { @@ -152,7 +154,9 @@ "asn": "65515", "bgpPeeringAddress": "", "peerWeight": "5" - } + }, + "ipConfigurationName": "vnetGatewayConfig", + "ipConfigurationActiveActiveName": "vnetGatewayConfig2" } }, "parTelemetryOptOut": {