update the default cluster version

g0pinath · Sep 22, 2017 · 52ae83e · 52ae83e
1 parent faeeece
commit 52ae83e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/101-hdinsight-linux-with-sql-database/README.md b/101-hdinsight-linux-with-sql-database/README.md
@@ -7,4 +7,4 @@
     <img src="http://armviz.io/visualizebutton.png"/>
 </a>
 
-This template allows you to create a Linux-based HDInsight cluster, a SQL Database server, a SQL Database, and two tables. This template is used by the Use Sqoop with Hadoop in HDInsight article, https://azure.microsoft.com/documentation/articles/hdinsight-use-sqoop/. 
+This template allows you to create a HDInsight cluster, a SQL Database server, a SQL Database, and two tables. This template is used by the Use Sqoop with Hadoop in HDInsight article, https://azure.microsoft.com/documentation/articles/hdinsight-use-sqoop/. 
diff --git a/101-hdinsight-linux-with-sql-database/azuredeploy.json b/101-hdinsight-linux-with-sql-database/azuredeploy.json
@@ -101,7 +101,7 @@
 
       },
       "properties": {
-        "clusterVersion": "3.5",
+        "clusterVersion": "3.6",
         "osType": "Linux",
         "clusterDefinition": {
           "kind": "hadoop",
@@ -156,23 +156,23 @@
       }
     },
     {
-      "name": "[variables('sqlDatabase').serverName]",
       "type": "Microsoft.Sql/servers",
+      "name": "[variables('sqlDatabase').serverName]",
+      "dependsOn": [ ],
       "location": "[resourceGroup().location]",
       "tags": {
         "displayName": "SqlServer"        
       },
-      "apiVersion": "2014-04-01",
-      "dependsOn": [ ],
+      "apiVersion": "2015-05-01-preview",
       "properties": {
         "administratorLogin": "[parameters('sqlAdminLogin')]",
         "administratorLoginPassword": "[parameters('sqlAdminPassword')]",
         "version": "12.0"
       },
       "resources": [
         {
-          "name": "[variables('sqlDatabase').databaseName]",
           "type": "databases",
+          "name": "[variables('sqlDatabase').databaseName]",
           "location": "[resourceGroup().location]",
           "tags": {
             "displayName": "Database"
@@ -207,12 +207,12 @@
           ]
         },
         {
-          "name": "AllowAllAzureIps",
           "type": "firewallrules",
+          "name": "AllowAllAzureIps",
           "location": "[resourceGroup().location]",
           "apiVersion": "2014-04-01",
           "dependsOn": [
-            "[variables('sqlDatabase').serverName]"
+            "[concat('Microsoft.Sql/servers/', variables('sqlDatabase').serverName)]"
           ],
           "properties": {
             "startIpAddress": "0.0.0.0",

diff --git a/101-hdinsight-linux-with-sql-database/metadata.json b/101-hdinsight-linux-with-sql-database/metadata.json
@@ -1,7 +1,7 @@
 {
-  "itemDisplayName": "Deploy a Linux-based HDInsight cluster and a SQL database",
-  "description": "This template allows you to create a Linux-based HDInsight cluster and a SQL Database for testing Sqoop.",
-  "summary": "Deploy a Linux-based HDInsight cluster and a SQL Database",
+  "itemDisplayName": "Deploy a HDInsight cluster and a SQL database",
+  "description": "This template allows you to create a HDInsight cluster and a SQL Database for testing Sqoop.",
+  "summary": "Deploy a HDInsight cluster and a SQL Database",
   "githubUsername": "mumian",
-  "dateUpdated": "2017-03-08"
+  "dateUpdated": "2017-09-22"
 }