brian feedback

paulpc · Nov 15, 2016 · 62b9777 · 62b9777
1 parent df95d6b
commit 62b9777
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/101-hdinsight-hbase-linux-vnet/azuredeploy.json b/101-hdinsight-hbase-linux-vnet/azuredeploy.json
@@ -44,7 +44,9 @@
       "name": "[concat(parameters('clusterName'),'-vnet')]",
       "addressSpacePrefix": "10.0.0.0/16",
       "subnetName": "subnet1",
-      "subnetPrefix": "10.0.0.0/24"
+      "subnetPrefix": "10.0.0.0/24",
+      "id": "[resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name)]",
+      "subnet": "[concat(resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name), '/subnets/', variables('vNet').subnetName)]"
     }
   },
   "resources": [
@@ -106,7 +108,7 @@
         "storageProfile": {
           "storageaccounts": [
             {
-              "name": "[concat(variables('defaultStorageAccount').name,'.blob.core.windows.net')]",
+              "name": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', variables('defaultStorageAccount')), '2016-01-01').primaryEndpoints.blob,'https://',''),'/','')]",     
               "isDefault": true,
               "container": "[parameters('clusterName')]",
               "key": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('defaultStorageAccount').name), '2016-01-01').keys[0].value]"
@@ -128,8 +130,8 @@
                 }
               },
               "virtualNetworkProfile": {
-                "id": "[resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name)]",
-                "subnet": "[concat(resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name), '/subnets/', variables('vNet').subnetName)]"
+                "id": "[variables('vNet').id]",
+                "subnet": "[variables('vNet').subnet]"
               }
             },
             {
@@ -145,8 +147,8 @@
                 }
               },
               "virtualNetworkProfile": {
-                "id": "[resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name)]",
-                "subnet": "[concat(resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name), '/subnets/', variables('vNet').subnetName)]"
+                "id": "[variables('vNet').id]",
+                "subnet": "[variables('vNet').subnet]"
               }
             },
             {
@@ -162,8 +164,8 @@
                 }
               },
               "virtualNetworkProfile": {
-                "id": "[resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name)]",
-                "subnet": "[concat(resourceId('Microsoft.Network/virtualNetworks', variables('vNet').name), '/subnets/', variables('vNet').subnetName)]"
+                "id": "[variables('vNet').id]",
+                "subnet": "[variables('vNet').subnet]"
               }
             }
           ]

diff --git a/101-hdinsight-hbase-linux-vnet/azuredeploy.parameters.json b/101-hdinsight-hbase-linux-vnet/azuredeploy.parameters.json
@@ -6,13 +6,13 @@
           "value": "GEN-UNIQUE"
         },
         "clusterLoginUserName": {
-            "value": "GEN-USER"
+            "value": "GEN-UNIQUE"
         },
         "clusterLoginPassword": {
           "value": "GEN-PASSWORD"
         },
         "sshUserName": {
-            "value": "GEN-USER"
+            "value": "GEN-UNIQUE"
         },
         "sshPassword": {
           "value": "GEN-PASSWORD"