Merge pull request #101 from Azure/revert-87-master

Revert #87 to keep master at AzureStackTechnicalPreview1

Author: ttw2001

101-simple-windows-vm/azuredeploy.json

@@ -23,9 +23,8 @@
         "adminPassword": {
             "type": "securestring",
             "metadata": {
-                "description": "The password for the Administrator account of the new VMs. Default value is subscription id"
-            },
-            "defaultValue": "[substring(resourcegroup().id,15,36)]"
+                "description": "Password for the Virtual Machine."
+            }
         },
         "dnsNameForPublicIP": {
             "type": "string",

101-simple-windows-vm/azuredeploy.parameters.json

@@ -11,6 +11,9 @@
     "adminUsername": {
       "value": "admin123"
     },
+    "adminPassword": {
+      "value": "GEN-PASSWORD"
+    },
     "dnsNameForPublicIP": {
       "value": "mydns001"
     },