diff --git a/101-hdinsight-spark-linux-vnet/README.md b/101-hdinsight-spark-linux-vnet/README.md
index 89a6459628c0..2bb882747041 100644
--- a/101-hdinsight-spark-linux-vnet/README.md
+++ b/101-hdinsight-spark-linux-vnet/README.md
@@ -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
diff --git a/101-hdinsight-spark-linux-vnet/azuredeploy.json b/101-hdinsight-spark-linux-vnet/azuredeploy.json
index b671538098bc..5e1fb4e1c72c 100644
--- a/101-hdinsight-spark-linux-vnet/azuredeploy.json
+++ b/101-hdinsight-spark-linux-vnet/azuredeploy.json
@@ -94,7 +94,7 @@
],
"tags": {},
"properties": {
- "clusterVersion": "3.5",
+ "clusterVersion": "3.6",
"osType": "Linux",
"tier": "Standard",
"clusterDefinition": {
diff --git a/101-hdinsight-spark-linux-vnet/metadata.json b/101-hdinsight-spark-linux-vnet/metadata.json
index 5f18d45853fb..4e9755e9a196 100644
--- a/101-hdinsight-spark-linux-vnet/metadata.json
+++ b/101-hdinsight-spark-linux-vnet/metadata.json
@@ -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"
}
diff --git a/101-hdinsight-spark-linux/README.md b/101-hdinsight-spark-linux/README.md
index 268476d13499..9b463b4dd32e 100644
--- a/101-hdinsight-spark-linux/README.md
+++ b/101-hdinsight-spark-linux/README.md
@@ -1,4 +1,4 @@
-# Deploy an HDInsight Linux-based Spark cluster
+# Deploy a Spark cluster in Azure HDInsight
@@ -7,4 +7,4 @@
-This template allows you to a Linux-based Spark cluster in HDInsight with the dependent Azure storage account.
\ No newline at end of file
+This template allows you to a Spark cluster in HDInsight with the dependent Azure storage account.
\ No newline at end of file
diff --git a/101-hdinsight-spark-linux/azuredeploy.json b/101-hdinsight-spark-linux/azuredeploy.json
index 902e7af608b5..6f20db3565b2 100644
--- a/101-hdinsight-spark-linux/azuredeploy.json
+++ b/101-hdinsight-spark-linux/azuredeploy.json
@@ -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",
@@ -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,
@@ -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": []
}
]
}
diff --git a/101-hdinsight-spark-linux/azuredeploy.parameters.json b/101-hdinsight-spark-linux/azuredeploy.parameters.json
index 9e7cf0267569..bbfa3f07ef6c 100644
--- a/101-hdinsight-spark-linux/azuredeploy.parameters.json
+++ b/101-hdinsight-spark-linux/azuredeploy.parameters.json
@@ -5,9 +5,6 @@
"clusterName":{
"value":"GEN-UNIQUE"
},
- "sparkVersion":{
- "value":"1.6"
- },
"clusterLoginUserName":{
"value":"GEN-UNIQUE"
},
diff --git a/101-hdinsight-spark-linux/metadata.json b/101-hdinsight-spark-linux/metadata.json
index 52a1520e03d7..9c8b3a9e06d5 100644
--- a/101-hdinsight-spark-linux/metadata.json
+++ b/101-hdinsight-spark-linux/metadata.json
@@ -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"
}