Merge pull request #1966 from craddm/fix-public-ip

Change public IP address SKU from basic to standard
alan-turing-institute · Jun 27, 2024 · 8499dd2 · 8499dd2
2 parents 479855b + 7339b76
commit 8499dd2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/deployment/common/AzureNetwork.psm1 b/deployment/common/AzureNetwork.psm1
@@ -408,9 +408,6 @@ function Deploy-PublicIpAddress {
     if ($notExists) {
         Add-LogMessage -Level Info "[ ] Creating public IP address '$Name'"
         $ipAddressParams = @{}
-        if ($Sku -eq "Standard") {
-            $ipAddressParams["Zone"] = @(1, 2, 3)
-        }
         $publicIpAddress = New-AzPublicIpAddress -Name $Name -ResourceGroupName $ResourceGroupName -AllocationMethod $AllocationMethod -Location $Location -Sku $Sku @ipAddressParams
         if ($?) {
             Add-LogMessage -Level Success "Created public IP address '$Name'"

diff --git a/deployment/safe_haven_management_environment/setup/Setup_SHM_Networking.ps1 b/deployment/safe_haven_management_environment/setup/Setup_SHM_Networking.ps1
@@ -102,7 +102,7 @@ $deploymentTier3Subnet = Set-SubnetNetworkSecurityGroup -Subnet $deploymentTier3
 
 # Create the VPN gateway
 # ----------------------
-$publicIp = Deploy-PublicIpAddress -Name "$($config.network.vnet.name)_GW_PIP" -ResourceGroupName $config.network.vnet.rg -AllocationMethod Dynamic -Location $config.location
+$publicIp = Deploy-PublicIpAddress -Name "$($config.network.vnet.name)_GW_PIP" -ResourceGroupName $config.network.vnet.rg -AllocationMethod Static -Location $config.location -Sku Standard
 $certificate = Resolve-KeyVaultSecret -VaultName $config.keyVault.name -SecretName $config.keyVault.secretNames.vpnCaCertificatePlain -AsPlaintext
 $null = Deploy-VirtualNetworkGateway -Name "$($config.network.vnet.name)_GW" -ResourceGroupName $config.network.vnet.rg -Location $config.location -PublicIpAddressId $publicIp.Id -SubnetId $gatewaySubnet.Id -P2SCertificate $certificate -VpnClientAddressPool $config.network.vpn.cidr