separating probes for the LB to work on 80 and 443 respectively

ULCC · May 29, 2018 · 04774bb · 04774bb
1 parent 07c64e6
commit 04774bb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -970,7 +970,8 @@
             "extBeName": "[concat('lb-backend-',variables('resourceprefix'))]",
             "extFeName": "[concat('lb-frontend-',variables('resourceprefix'))]",
             "extNatPool": "[concat('lb-natpool-',variables('resourceprefix'))]",
-            "extProbe": "[concat('lb-probe-',variables('resourceprefix'))]",
+            "extProbeHTTP": "[concat('lb-probe-http-',variables('resourceprefix'))]",
+            "extProbeHTTPS": "[concat('lb-probe-https-',variables('resourceprefix'))]",
             "fileServerDiskCount": "[parameters('fileServerDiskCount')]",
             "fileServerDiskSize": "[parameters('fileServerDiskSize')]",
             "fileServerType": "[parameters('fileServerType')]",

diff --git a/nested/network.json b/nested/network.json
@@ -222,7 +222,7 @@
                             "frontendPort": 80,
                             "idleTimeoutInMinutes": 5,
                             "probe": {
-                                "id": "[variables('extProbeID')]"
+                                "id": "[variables('extProbeHTTPID')]"
                             },
                             "protocol": "Tcp"
                         }
@@ -241,21 +241,30 @@
                             "frontendPort": 443,
                             "idleTimeoutInMinutes": 5,
                             "probe": {
-                                "id": "[variables('extProbeID')]"
+                                "id": "[variables('extProbeHTTPSID')]"
                             },
                             "protocol": "Tcp"
                         }
                     }
                 ],
                 "probes": [
                     {
-                        "name": "[parameters('moodleCommon').extProbe  ]",
+                        "name": "[parameters('moodleCommon').extProbeHTTP  ]",
                         "properties": {
                             "intervalInSeconds": 5,
                             "numberOfProbes": 3,
                             "port": 80,
                             "protocol": "Tcp"
                         }
+                    },
+                    {
+                        "name": "[parameters('moodleCommon').extProbeHTTPS  ]",
+                        "properties": {
+                            "intervalInSeconds": 5,
+                            "numberOfProbes": 3,
+                            "port": 443,
+                            "protocol": "Tcp"
+                        }
                     }
                 ]
             }
@@ -298,7 +307,8 @@
         "extBeID": "[concat(variables('extLbID'),'/backendAddressPools/',parameters('moodleCommon').extBeName)]",
         "extFeID": "[concat(variables('extLbID'),'/frontendIPConfigurations/',parameters('moodleCommon').extFeName)]",
         "extLbID": "[resourceId('Microsoft.Network/loadBalancers',parameters('moodleCommon').lbName)]",
-        "extProbeID": "[concat(variables('extLbID'),'/probes/',parameters('moodleCommon').extProbe)]",
+        "extProbeHTTPID": "[concat(variables('extLbID'),'/probes/',parameters('moodleCommon').extProbeHTTP)]",
+        "extProbeHTTPSID": "[concat(variables('extLbID'),'/probes/',parameters('moodleCommon').extProbeHTTPS)]",
         "lbPipID": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('moodleCommon').lbPipName)]",
         "ctlrPipID": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('moodleCommon').ctlrPipName)]",
         "customVnetIdArr":              "[split(parameters('moodleCommon').customVnetId, '/')]",

diff --git a/nested/webvmss.json b/nested/webvmss.json
@@ -190,7 +190,6 @@
         "extBeID": "[concat(variables('extLbID'),'/backendAddressPools/',parameters('moodleCommon').extBeName)]",
         "extFeID": "[concat(variables('extLbID'),'/frontendIPConfigurations/',parameters('moodleCommon').extFeName)]",
         "extLbID": "[resourceId('Microsoft.Network/loadBalancers',parameters('moodleCommon').lbName)]",
-        "extProbeID": "[concat(variables('extLbID'),'/probes/',parameters('moodleCommon').extProbe  )]",
         "pipID": "[resourceId('Microsoft.Network/publicIPAddresses',parameters('moodleCommon').lbPipName)]",
         "scriptUri": "[concat(parameters('moodleCommon').scriptLocation,parameters('moodleCommon').webServerSetupScriptFilename,parameters('moodleCommon').artifactsSasToken)]",
         "storageAccountId": "[resourceId('Microsoft.Storage/storageAccounts', parameters('moodleCommon').storageAccountName)]",