Merge pull request Azure#8877 from guyhay/InteractiveHive2

Updates to ev3 and HDI 4
fitchtech · Mar 11, 2021 · 63b2b75 · 63b2b75
2 parents 57fe1ad + 0c96014
commit 63b2b75
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 11 deletions.
diff --git a/101-hdinsight-interactive-hive/azuredeploy.json b/101-hdinsight-interactive-hive/azuredeploy.json
@@ -16,8 +16,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": {
@@ -28,8 +29,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": {
@@ -38,7 +41,61 @@
       "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_E16_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 worerdnode Azure Virtual Machine size, and will affect the cost. If you don't know, just leave the default value."
+      }
+    },
+    "ZookeeperNodeVirtualMachineSize": {
+      "type": "string",
+      "defaultValue": "Standard_E4_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 worerdnode Azure Virtual Machine size, and will affect the cost. If you don't know, just leave the default value."
+      }
+    }            
   },
   "variables": {
     "defaultStorageAccount": {
@@ -67,7 +124,7 @@
         "[resourceId('Microsoft.Storage/storageAccounts/', variables('defaultStorageAccount').name)]"
       ],
       "properties": {
-        "clusterVersion": "3.6",
+        "clusterVersion": "4.0",
         "osType": "Linux",
         "tier": "Standard",
         "clusterDefinition": {
@@ -97,7 +154,7 @@
               "minInstanceCount": 1,
               "targetInstanceCount": 2,
               "hardwareProfile": {
-                "vmSize": "Standard_D13_V2"
+              "vmSize": "[parameters('HeadNodeVirtualMachineSize')]"
               },
               "osProfile": {
                 "linuxOperatingSystemProfile": {
@@ -111,7 +168,7 @@
               "minInstanceCount": 1,
               "targetInstanceCount": 2,
               "hardwareProfile": {
-                "vmSize": "Standard_D14_v2"
+                "vmSize": "[parameters('WorkerNodeVirtualMachineSize')]"
               },
               "osProfile": {
                 "linuxOperatingSystemProfile": {
@@ -125,7 +182,7 @@
               "minInstanceCount": 1,
               "targetInstanceCount": 3,
               "hardwareProfile": {
-                "vmSize": "Large"
+                "vmSize": "[parameters('ZookeeperNodeVirtualMachineSize')]"
               },
               "osProfile": {
                 "linuxOperatingSystemProfile": {

diff --git a/101-hdinsight-interactive-hive/metadata.json b/101-hdinsight-interactive-hive/metadata.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
-  "type": "QuickStart",
   "itemDisplayName": "Deploy an Interative Hive cluster in HDInsight.",
   "description": "This template allows you to create an Interative Hive (LLAP) cluster in HDInsight and the dependent Azure Storage account. The SSH authentication method for the cluster is username and password. For a template using SSH public key authentication, see https://azure.microsoft.com/resources/templates/101-hdinsight-linux-ssh-publickey/",
   "summary": "Deploy an Linux-based Interative Hive cluster in HDInsight.",
-  "githubUsername": "mumian",
-  "docOwner": "hrasheed-msft",
-  "dateUpdated": "2020-09-17"
+  "githubUsername": "guyhay",
+  "docOwner": "jasonhowell",
+  "dateUpdated": "2021-03-08",
+  "type": "QuickStart"
 }