update cloudera-on-centos offering

Azure · Nov 15, 2016 · 355137c · 355137c
1 parent f58a42c
commit 355137c
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 43 deletions.
diff --git a/cloudera-on-centos/README.md b/cloudera-on-centos/README.md
diff --git a/cloudera-on-centos/azuredeploy.json b/cloudera-on-centos/azuredeploy.json
@@ -40,11 +40,18 @@
         "description": "Unique public DNS name where the VMs will be exposed"
       }
     },
-    "storageAccountType": {
+    "masterStorageAccountType": {
       "type": "string",
       "defaultValue": "Premium_LRS",
       "metadata": {
-        "description": "The type of the Storage Account to be created (Default to Premium_LRS)"
+        "description": "The type of the Storage Account to be created for master nodes (defaults to Premium_LRS)"
+      }
+    },
+    "workerStorageAccountType": {
+      "type": "string",
+      "defaultValue": "Standard_LRS",
+      "metadata": {
+        "description": "The type of the Storage Account to be created for worker nodes (defaults to Standard_LRS)"
       }
     },
     "virtualNetworkName": {
@@ -227,9 +234,13 @@
     "ipOctet2": "[int(split(variables('sa'), '.')[2])]",
     "ipOctet3": "[int(split(variables('sa'), '.')[3])]",
     "datanodeIpOctet3":"[add(int(split(variables('sa'), '.')[3]), parameters('dataNodeIPOffSetFromMaster'))]",
-    "storageAccount": {
+    "masterStorageAccount": {
+      "prefix": "[parameters('storageAccountPrefix')]",
+      "type": "[parameters('masterStorageAccountType')]"
+    },
+    "workerStorageAccount": {
       "prefix": "[parameters('storageAccountPrefix')]",
-      "type": "[parameters('storageAccountType')]"
+      "type": "[parameters('workerStorageAccountType')]"
     },
     "clusterTshirtSizeEval": {
       "masterNodeCount": 1,
@@ -321,7 +332,7 @@
             "value": "[variables('scriptsUri')]"
           },
           "storageAccount": {
-            "value": "[variables('storageAccount')]"
+            "value": "[variables('masterStorageAccount')]"
           },
           "vmCount": {
             "value": "[variables('clusterSpec').masterNodeCount]"
@@ -365,7 +376,7 @@
             "value": "[variables('scriptsUri')]"
           },
           "storageAccount": {
-            "value": "[variables('storageAccount')]"
+            "value": "[variables('workerStorageAccount')]"
           },
           "vmCount": {
             "value": "[variables('clusterSpec').dataNodeCount]"

diff --git a/cloudera-on-centos/ds13.json b/cloudera-on-centos/ds13.json
@@ -40,11 +40,18 @@
         "description": "Unique public DNS name where the VMs will be exposed"
       }
     },
-    "storageAccountType": {
+    "masterStorageAccountType": {
       "type": "string",
       "defaultValue": "Premium_LRS",
       "metadata": {
-        "description": "The type of the Storage Account to be created (Default to Premium_LRS)"
+        "description": "The type of the Storage Account to be created for master nodes (defaults to Premium_LRS)"
+      }
+    },
+    "workerStorageAccountType": {
+      "type": "string",
+      "defaultValue": "Standard_LRS",
+      "metadata": {
+        "description": "The type of the Storage Account to be created for worker nodes (defaults to Standard_LRS)"
       }
     },
     "virtualNetworkName": {
@@ -227,9 +234,13 @@
     "ipOctet2": "[int(split(variables('sa'), '.')[2])]",
     "ipOctet3": "[int(split(variables('sa'), '.')[3])]",
     "datanodeIpOctet3":"[add(int(split(variables('sa'), '.')[3]), parameters('dataNodeIPOffSetFromMaster'))]",
-    "storageAccount": {
+    "masterStorageAccount": {
+      "prefix": "[parameters('storageAccountPrefix')]",
+      "type": "[parameters('masterStorageAccountType')]"
+    },
+    "workerStorageAccount": {
       "prefix": "[parameters('storageAccountPrefix')]",
-      "type": "[parameters('storageAccountType')]"
+      "type": "[parameters('workerStorageAccountType')]"
     },
     "clusterTshirtSizeEval": {
       "masterNodeCount": 1,
@@ -321,7 +332,7 @@
             "value": "[variables('scriptsUri')]"
           },
           "storageAccount": {
-            "value": "[variables('storageAccount')]"
+            "value": "[variables('masterStorageAccount')]"
           },
           "vmCount": {
             "value": "[variables('clusterSpec').masterNodeCount]"
@@ -365,7 +376,7 @@
             "value": "[variables('scriptsUri')]"
           },
           "storageAccount": {
-            "value": "[variables('storageAccount')]"
+            "value": "[variables('workerStorageAccount')]"
           },
           "vmCount": {
             "value": "[variables('clusterSpec').dataNodeCount]"
@@ -452,4 +463,4 @@
       }
     }
   ]
-}
+}
diff --git a/cloudera-on-centos/master-node.json b/cloudera-on-centos/master-node.json
@@ -234,7 +234,7 @@
     },
     {
       "type": "Microsoft.Storage/storageAccounts",
-      "name": "[concat(variables('storageAccountName'), copyIndex())]",
+      "name": "[concat(copyIndex(), variables('storageAccountName'))]",
       "apiVersion": "[parameters('resourceAPIVersion')]",
       "location": "[resourceGroup().location]",
       "copy": {
@@ -311,7 +311,7 @@
       },
       "dependsOn": [
         "[concat('Microsoft.Network/networkInterfaces/', variables('nicName'), copyIndex())]",
-        "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName'), copyIndex())]"
+        "[concat('Microsoft.Storage/storageAccounts/', copyIndex(), variables('storageAccountName'))]"
       ],
       "properties": {
         "availabilitySet": {
@@ -338,7 +338,7 @@
           "osDisk": {
             "name": "osdisk",
             "vhd": {
-              "uri": "[concat('http://', variables('storageAccountName'), copyIndex(), '.blob.core.windows.net/vhds/', variables('vmName'), copyIndex(), '.vhd')]"
+              "uri": "[concat('http://', copyIndex(), variables('storageAccountName'), '.blob.core.windows.net/vhds/', variables('vmName'), copyIndex(), '.vhd')]"
             },
             "caching": "ReadWrite",
             "createOption": "FromImage"
@@ -349,7 +349,7 @@
               "diskSizeGB": "512",
               "lun": 0,
               "vhd": {
-                "Uri": "[concat('http://', variables('storageAccountName'), copyIndex(), '.blob.core.windows.net/vhds0/', variables('vmName'), '-datadisk0.vhd')]"
+                "Uri": "[concat('http://', copyIndex(), variables('storageAccountName'), '.blob.core.windows.net/vhds0/', variables('vmName'), '-datadisk0.vhd')]"
               },
               "createOption": "Empty"
             },
@@ -358,7 +358,7 @@
               "diskSizeGB": "512",
               "lun": 1,
               "vhd": {
-                "Uri": "[concat('http://', variables('storageAccountName'), copyIndex(), '.blob.core.windows.net/vhds1/', variables('vmName'), '-datadisk1.vhd')]"
+                "Uri": "[concat('http://', copyIndex(), variables('storageAccountName'), '.blob.core.windows.net/vhds1/', variables('vmName'), '-datadisk1.vhd')]"
               },
               "createOption": "Empty"
             },
@@ -367,7 +367,7 @@
               "diskSizeGB": "512",
               "lun": 2,
               "vhd": {
-                "Uri": "[concat('http://', variables('storageAccountName'), copyIndex(), '.blob.core.windows.net/vhds2/', variables('vmName'), '-datadisk2.vhd')]"
+                "Uri": "[concat('http://', copyIndex(), variables('storageAccountName'), '.blob.core.windows.net/vhds2/', variables('vmName'), '-datadisk2.vhd')]"
               },
               "createOption": "Empty"
             },
@@ -376,7 +376,7 @@
               "diskSizeGB": "512",
               "lun": 3,
               "vhd": {
-                "Uri": "[concat('http://', variables('storageAccountName'), copyIndex(), '.blob.core.windows.net/vhds3/', variables('vmName'), '-datadisk3.vhd')]"
+                "Uri": "[concat('http://', copyIndex(), variables('storageAccountName'), '.blob.core.windows.net/vhds3/', variables('vmName'), '-datadisk3.vhd')]"
               },
               "createOption": "Empty"
             }

diff --git a/cloudera-on-centos/metadata.json b/cloudera-on-centos/metadata.json
@@ -1,7 +1,7 @@
 {
   "itemDisplayName": "Cloudera Cluster",
   "description": "This template deploys a multi VM Cloudera cluster, with one node running Cloudera Manager, two name nodes, and N data nodes.",
-  "summary": "This template deploys a multi VM Cloudera cluster on CentOS 6.5",
-  "githubUsername": "liupeirong",
-  "dateUpdated": "2015-07-06"
+  "summary": "This template deploys a multi VM Cloudera cluster on CentOS 6.7",
+  "githubUsername": "jasonbw",
+  "dateUpdated": "2016-11-11"
 }
diff --git a/cloudera-on-centos/scripts/bootstrap-cloudera.sh b/cloudera-on-centos/scripts/bootstrap-cloudera.sh
@@ -121,7 +121,12 @@ log "Worker ip to be supplied to next script: $worker_ip"
 log "BEGIN: Starting detached script to finalize initialization"
 if [ "$INSTALLCDH" == "True" ]
 then
-  sh initialize-cloudera-server.sh "$CLUSTERNAME" "$key" "$mip" "$worker_ip" "$HA" "$ADMINUSER" "$PASSWORD" "$CMUSER" "$CMPASSWORD" "$EMAILADDRESS" "$BUSINESSPHONE" "$FIRSTNAME" "$LASTNAME" "$JOBROLE" "$JOBFUNCTION" "$COMPANY" "$VMSIZE">/dev/null 2>&1
+  if ! sh initialize-cloudera-server.sh "$CLUSTERNAME" "$key" "$mip" "$worker_ip" "$HA" "$ADMINUSER" "$PASSWORD" "$CMUSER" "$CMPASSWORD" "$EMAILADDRESS" "$BUSINESSPHONE" "$FIRSTNAME" "$LASTNAME" "$JOBROLE" "$JOBFUNCTION" "$COMPANY" "$VMSIZE">/dev/null 2>&1
+  then
+    log "initialize-cloudera-server.sh failed."
+    exit 1
+  fi
+  log "initialize-cloudera-server.sh succeeded."
 fi
 log "END: Detached script to finalize initialization running. PID: $!"