Skip to content

Commit

Permalink
update cluster version
Browse files Browse the repository at this point in the history
  • Loading branch information
mumian committed Nov 20, 2017
1 parent 5818928 commit a145b56
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 32 deletions.
2 changes: 1 addition & 1 deletion 101-hdinsight-spark-linux-vnet/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Deploy an Azure VNet and an HDInsight Linux-based Spark cluster within the VNet
# Deploy an Azure VNet and an HDInsight Spark cluster within the VNet

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-hdinsight-spark-linux-vnet%2Fazuredeploy.json" target="_blank">
<img src="http://azuredeploy.net/deploybutton.png"/>
Expand Down
2 changes: 1 addition & 1 deletion 101-hdinsight-spark-linux-vnet/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
],
"tags": {},
"properties": {
"clusterVersion": "3.5",
"clusterVersion": "3.6",
"osType": "Linux",
"tier": "Standard",
"clusterDefinition": {
Expand Down
6 changes: 3 additions & 3 deletions 101-hdinsight-spark-linux-vnet/metadata.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"itemDisplayName": "Deploy a Spark cluster in a VNet",
"description": "This template allows you to create an Azure VNet and an HDInsight Spark cluster running Linux within the VNet.",
"summary": "Deploy an Azure VNet and an HDInsight Linux-based Spark cluster within the 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": "2017-03-15"
"dateUpdated": "2017-11-20"
}
4 changes: 2 additions & 2 deletions 101-hdinsight-spark-linux/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Deploy an HDInsight Linux-based Spark cluster
# Deploy a Spark cluster in Azure HDInsight

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2F101-hdinsight-spark-linux%2Fazuredeploy.json" target="_blank">
<img src="http://azuredeploy.net/deploybutton.png"/>
Expand All @@ -7,4 +7,4 @@
<img src="http://armviz.io/visualizebutton.png"/>
</a>

This template allows you to a Linux-based Spark cluster in HDInsight with the dependent Azure storage account.
This template allows you to a Spark cluster in HDInsight with the dependent Azure storage account.
28 changes: 9 additions & 19 deletions 101-hdinsight-spark-linux/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,6 @@
"description":"The name of the HDInsight cluster to create."
}
},
"sparkVersion":{
"type":"string",
"defaultValue":"1.6",
"allowedValues":[
"1.6",
"2.0"
],
"metadata":{
"description":"Spark version to be installed in the cluster. This parameter only applies to Spark cluster type in HDI 3.5 and will fail for other cluster types and other cluster versions."
}
},
"clusterLoginUserName":{
"type":"string",
"defaultValue":"admin",
Expand Down Expand Up @@ -74,14 +63,11 @@
],
"tags":{},
"properties":{
"clusterVersion":"3.5",
"clusterVersion":"3.6",
"osType":"Linux",
"tier":"Standard",
"clusterDefinition":{
"kind":"spark",
"componentVersion":{
"Spark":"[parameters('sparkVersion')]"
},
"configurations":{
"gateway":{
"restAuthCredential.isEnabled":true,
Expand All @@ -106,27 +92,31 @@
"name": "headnode",
"targetInstanceCount": "2",
"hardwareProfile": {
"vmSize": "Standard_D3_v2"
"vmSize": "Standard_D12_v2"
},
"osProfile":{
"linuxOperatingSystemProfile":{
"username":"[parameters('sshUserName')]",
"password":"[parameters('sshPassword')]"
}
}
},
"virtualNetworkProfile": null,
"scriptActions": []
},
{
"name": "workernode",
"targetInstanceCount": "2",
"hardwareProfile": {
"vmSize": "Standard_D3_v2"
"vmSize": "Standard_D13_v2"
},
"osProfile":{
"linuxOperatingSystemProfile":{
"username":"[parameters('sshUserName')]",
"password":"[parameters('sshPassword')]"
}
}
},
"virtualNetworkProfile": null,
"scriptActions": []
}
]
}
Expand Down
3 changes: 0 additions & 3 deletions 101-hdinsight-spark-linux/azuredeploy.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"clusterName":{
"value":"GEN-UNIQUE"
},
"sparkVersion":{
"value":"1.6"
},
"clusterLoginUserName":{
"value":"GEN-UNIQUE"
},
Expand Down
6 changes: 3 additions & 3 deletions 101-hdinsight-spark-linux/metadata.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"itemDisplayName": "Deploy a Linux-based Spark cluster in HDInsight",
"description": "This template allows you to create a Linux-based Spark cluster in Azure HDInsight. ",
"itemDisplayName": "Deploy a Spark cluster in Azure HDInsight",
"description": "This template allows you to create a Spark cluster in Azure HDInsight. ",
"summary": "Deploy a Linux-based Spark cluster in Azure HDInsight",
"githubUsername": "mumian",
"dateUpdated": "2017-03-15"
"dateUpdated": "2017-11-20"
}

0 comments on commit a145b56

Please sign in to comment.