variablizing zones for GW, id peering logic

Azure · Jun 28, 2024 · 0e2e06f · 0e2e06f
1 parent f557fab
commit 0e2e06f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/eslzArm/eslzArm.json b/eslzArm/eslzArm.json
@@ -7042,7 +7042,7 @@
         },
         {
             // Peer vnet in identity subscription to connectivity hub if vhub or nva condition is true
-            "condition": "[and(or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), not(empty(parameters('identityAddressPrefixSecondary'))))]",
+            "condition": "[and(or(equals(parameters('enableHub'), 'nva'), equals(parameters('enableHub'), 'vhub')), not(empty(parameters('identityAddress'))))]",
             "type": "Microsoft.Resources/deployments",
             "apiVersion": "2020-06-01",
             "name": "[variables('deploymentNames').identityPeeringDeploymentName]",
@@ -7089,7 +7089,7 @@
         },
         {
             // Peer vnet in identity subscription to connectivity hub in a secondary region if vhub or nva condition is true
-            "condition": "[and(or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableSecondaryRegion'), 'Yes'), equals(parameters('enableHubSecondary'), 'vhub')), not(empty(parameters('identityAddressPrefixSecondary'))))]",
+            "condition": "[and(or(equals(parameters('enableHubSecondary'), 'nva'), equals(parameters('enableHub'), 'vhub')), not(empty(parameters('identityAddressPrefixSecondary'))))]",
             "type": "Microsoft.Resources/deployments",
             "apiVersion": "2020-06-01",
             "name": "[variables('deploymentNames').identityPeering2DeploymentName]",

diff --git a/eslzArm/subscriptionTemplates/hubspoke-connectivity.json b/eslzArm/subscriptionTemplates/hubspoke-connectivity.json
@@ -177,6 +177,7 @@
         "azErGwIpName": "[concat(variables('erGwName'), '-pip')]",
         "azVpnGwPipId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'), '/providers/Microsoft.Network/publicIPAddresses/', variables('azVpnGwIpName'))]",
         "azVpnGwAAPipId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'), '/providers/Microsoft.Network/publicIPAddresses/', variables('azVpnGwAAIpName'))]",
+        "azVpnPIPZones": "1,2,3",
         "azFwIpName": "[concat(variables('azFwName'), '-pip')]",
         "azFwMgmtIpName": "[concat(variables('azFwName'), '-mgmtpip')]",
         "azErGwSubnetId": "[concat('/subscriptions/', parameters('connectivitySubscriptionId'), '/resourceGroups/', variables('rgName'),'/providers/Microsoft.Network/virtualNetworks/', variables('hubname'), '/subnets/GatewaySubnet')]",
@@ -302,7 +303,7 @@
                                             "type": "Microsoft.Network/publicIpAddresses",
                                             "location": "[parameters('location')]",
                                             "name": "[variables('azVpnGwIpName')]",
-                                            "zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), '1,2,3', json('null'))]",
+                                            "zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), variables('azVpnPIPZones'), json('null'))]",
                                             "sku": {
                                                 "name": "Standard"
                                             },
@@ -316,7 +317,7 @@
                                             "type": "Microsoft.Network/publicIpAddresses",
                                             "location": "[parameters('location')]",
                                             "name": "[variables('azVpnGwAAIpName')]",
-                                            "zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), '1,2,3', json('null'))]",
+                                            "zones": "[if(equals(parameters('gwRegionalOrAz'), 'Zone'), variables('azVpnPIPZones'), json('null'))]",
                                             "sku": {
                                                 "name": "Standard"
                                             },