Merge pull request Azure#8837 from guyhay/SparkLinuxVnet2

Update to ev3 and HDI 4.0

101-hdinsight-spark-linux-vnet/README.md

@@ -14,5 +14,3 @@
 [![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-hdinsight-spark-linux-vnet%2Fazuredeploy.json)
 
 This template allows you to create an Azure VNet and a Spark cluster within the VNet. 
-
-

101-hdinsight-spark-linux-vnet/azuredeploy.json

@@ -17,8 +17,9 @@
     },
     "clusterLoginPassword": {
       "type": "securestring",
+      "minLength": 10,
       "metadata": {
-        "description": "The password must be at least 10 characters in length and must contain at least one digit, one non-alphanumeric character, and one upper or lower case letter."
+        "description": "The password must be at least 10 characters in length and must contain at least one digit, one upper case letter, one lower case letter, and one non-alphanumeric character except (single-quote, double-quote, backslash, right-bracket, full-stop). Also, the password must not contain 3 consecutive characters from the cluster username or SSH username."
       }
     },
     "sshUserName": {
@@ -30,8 +31,10 @@
     },
     "sshPassword": {
       "type": "securestring",
+      "minLength": 6,
+      "maxLength": 72,
       "metadata": {
-        "description": "The password must be at least 10 characters in length and must contain at least one digit, one non-alphanumeric character, and one upper or lower case letter."
+        "description": "SSH password must be 6-72 characters long and must contain at least one digit, one upper case letter, and one lower case letter.  It must not contain any 3 consecutive characters from the cluster login name"
       }
     },
     "location": {
@@ -40,6 +43,42 @@
       "metadata": {
         "description": "Location for all resources."
       }
+    },
+      "HeadNodeVirtualMachineSize": {
+      "type": "string",
+      "defaultValue": "Standard_E8_v3",
+      "allowedValues": [
+        "Standard_A4_v2",
+        "Standard_A8_v2",
+        "Standard_E2_v3",
+        "Standard_E4_v3",
+        "Standard_E8_v3",
+        "Standard_E16_v3",
+        "Standard_E20_v3",
+        "Standard_E32_v3",
+        "Standard_E48_v3"
+      ],
+      "metadata": {
+        "description": "This is the headnode Azure Virtual Machine size, and will affect the cost. If you don't know, just leave the default value."
+      }
+    },
+    "WorkerNodeVirtualMachineSize": {
+      "type": "string",
+      "defaultValue": "Standard_E8_v3",
+      "allowedValues": [
+        "Standard_A4_v2",
+        "Standard_A8_v2",
+        "Standard_E2_v3",
+        "Standard_E4_v3",
+        "Standard_E8_v3",
+        "Standard_E16_v3",
+        "Standard_E20_v3",
+        "Standard_E32_v3",
+        "Standard_E48_v3"
+      ],
+      "metadata": {
+        "description": "This is the workernode Azure Virtual Machine size, and will affect the cost. If you don't know, just leave the default value."
+      }
     }
   },
   "variables": {
@@ -99,7 +138,7 @@
         "[resourceId('Microsoft.Network/virtualNetworks/', variables('vNet').name)]"
       ],
       "properties": {
-        "clusterVersion": "3.6",
+        "clusterVersion": "4.0",
         "osType": "Linux",
         "tier": "Standard",
         "clusterDefinition": {
@@ -128,7 +167,7 @@
               "name": "headnode",
               "targetInstanceCount": 2,
               "hardwareProfile": {
-                "vmSize": "Standard_D12_v2"
+                "vmSize": "[parameters('HeadNodeVirtualMachineSize')]"
               },
               "osProfile": {
                 "linuxOperatingSystemProfile": {
@@ -145,7 +184,7 @@
               "name": "workernode",
               "targetInstanceCount": 2,
               "hardwareProfile": {
-                "vmSize": "Standard_D13_v2"
+                "vmSize": "[parameters('WorkerNodeVirtualMachineSize')]"
               },
               "osProfile": {
                 "linuxOperatingSystemProfile": {

101-hdinsight-spark-linux-vnet/metadata.json

@@ -1,9 +1,9 @@
 {
   "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
-  "type": "QuickStart",
   "itemDisplayName": "Deploy a Spark cluster in a VNet",
   "description": "This template allows you to create an Azure VNet and an HDInsight Spark cluster within the VNet.",
   "summary": "Deploy an Azure VNet and an HDInsight Spark cluster within the VNet",
-  "githubUsername": "mumian",
-  "dateUpdated": "2020-09-17"
+  "githubUsername": "guyhay",
+  "dateUpdated": "2021-03-08",
+  "type": "QuickStart"
 }