From adc6735b13db28a0e70c24b59a16d8fed1972830 Mon Sep 17 00:00:00 2001
From: Hosung Song <hoson@microsoft.com>
Date: Tue, 29 May 2018 08:38:32 -0700
Subject: [PATCH] Add switches for accelerated networking (fixes #123)

---
 azuredeploy.json           | 16 ++++++++++++++++
 nested/controller.json     |  2 +-
 nested/glustervm.json      |  2 +-
 nested/search-elastic.json |  6 +++---
 nested/tika.json           |  2 +-
 nested/webvmss.json        |  2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/azuredeploy.json b/azuredeploy.json
index 4859377..4decf88 100644
--- a/azuredeploy.json
+++ b/azuredeploy.json
@@ -79,6 +79,20 @@
             },
             "type": "bool"
         },
+        "enableAccelNwForCtlrVmSwitch": {
+            "defaultValue": false,
+            "metadata": {
+                "description": "Switch to enable Azure Accelerated Networking on the controller VM. Default to false because currently the default controller VM SKU (D1) doesn't support AN. Change this to true if you set the controller VM SKU to eligibible ones (e.g., D2) for better performance."
+            },
+            "type": "bool"
+        },
+        "enableAccelNwForOtherVmsSwitch": {
+            "defaultValue": true,
+            "metadata": {
+                "description": "Switch to enable Azure Accelerated Networking on all other VMs. Default to true because currently the default controller VM SKU for all other VMS (D2) does support AN. Change this to false if you set the SKU of any other VMs to an ineligibible one (e.g., D1) to avoid deployment failure."
+            },
+            "type": "bool"
+        },
         "httpsTermination": {
             "allowedValues": [
                 "VMSS",
@@ -967,6 +981,8 @@
             "elasticVmName1": "[concat('elastic-vm-01-',variables('resourceprefix'))]",
             "elasticVmName2": "[concat('elastic-vm-02-',variables('resourceprefix'))]",
             "elasticVmName3": "[concat('elastic-vm-03-',variables('resourceprefix'))]",
+            "enableAccelNwForCtlrVmSwitch": "[parameters('enableAccelNwForCtlrVmSwitch')]",
+            "enableAccelNwForOtherVmsSwitch": "[parameters('enableAccelNwForOtherVmsSwitch')]",
             "extBeName": "[concat('lb-backend-',variables('resourceprefix'))]",
             "extFeName": "[concat('lb-frontend-',variables('resourceprefix'))]",
             "extNatPool": "[concat('lb-natpool-',variables('resourceprefix'))]",
diff --git a/nested/controller.json b/nested/controller.json
index 0b50e7a..83d17d9 100644
--- a/nested/controller.json
+++ b/nested/controller.json
@@ -105,7 +105,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": false
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForCtlrVmSwitch]"
             },
             "tags": {
                 "displayName": "ctlrNic"
diff --git a/nested/glustervm.json b/nested/glustervm.json
index 7948a83..cc3b16e 100644
--- a/nested/glustervm.json
+++ b/nested/glustervm.json
@@ -39,7 +39,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": true
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
             },
             "tags": {
                 "displayName": "Gluster VM NIC"
diff --git a/nested/search-elastic.json b/nested/search-elastic.json
index 5465a5c..042845d 100644
--- a/nested/search-elastic.json
+++ b/nested/search-elastic.json
@@ -34,7 +34,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": true
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
             },
             "tags": {
                 "displayName": "Elastic NIC 1"
@@ -152,7 +152,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": true
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
             },
             "tags": {
                 "displayName": "Elastic NIC 2"
@@ -270,7 +270,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": true
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
             },
             "tags": {
                 "displayName": "Elastic NIC 2"
diff --git a/nested/tika.json b/nested/tika.json
index e801787..25c0f25 100644
--- a/nested/tika.json
+++ b/nested/tika.json
@@ -34,7 +34,7 @@
                         }
                     }
                 ],
-                "enableAcceleratedNetworking": true
+                "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
             },
             "tags": {
                 "displayName": "Tika NIC"
diff --git a/nested/webvmss.json b/nested/webvmss.json
index 19fdf7f..91f7608 100644
--- a/nested/webvmss.json
+++ b/nested/webvmss.json
@@ -80,7 +80,7 @@
                                         }
                                     ],
                                     "primary": true,
-                                    "enableAcceleratedNetworking": true
+                                    "enableAcceleratedNetworking": "[parameters('moodleCommon').enableAccelNwForOtherVmsSwitch]"
                                 }
                             }
                         ]