Merge from Develop - 1

Author: vikasnav

101-simple-linux-vm/azuredeploy.json

@@ -56,7 +56,7 @@
         "virtualNetworkName": "[tolower(concat('vnet',uniquestring(resourceGroup().id)))]",
         "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
         "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
-        "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]"        
+        "networkSecurityGroupName": "[tolower(concat('nsg',uniquestring(resourceGroup().id)))]"
     },
     "resources": [
         {

101-simple-windows-vm/azuredeploy.json

@@ -6,31 +6,36 @@
             "type": "string",
             "metadata": {
                 "description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed."
-            }
+            },
+             "defaultValue": "[replace(replace(tolower(concat('sa',resourceGroup().name)), '-', ''), '.','')]"
         },
         "vmName": {
             "type": "string",
             "metadata": {
                 "description": "Name of the VM."
-            }
+            },
+            "defaultValue": "[substring(replace(replace(tolower(concat('vm',resourceGroup().name)), '-', ''), '.',''),0,8)]"
         },
         "adminUsername": {
             "type": "string",
             "metadata": {
                 "description": "Username for the Virtual Machine."
-            }
+            },
+            "defaultValue": "vmadmin1"
         },
         "adminPassword": {
             "type": "securestring",
             "metadata": {
-                "description": "Password for the Virtual Machine."
-            }
+                "description": "The password for the Administrator account of the new VMs. Default value is subscription id"
+            },
+            "defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]"
         },
         "dnsNameForPublicIP": {
             "type": "string",
             "metadata": {
                 "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
-            }
+            },
+            "defaultValue": "[replace(replace(tolower(concat('dns',resourceGroup().name)), '-', ''), '.','')]"
         },
         "windowsOSVersion": {
             "type": "string",
@@ -50,19 +55,19 @@
         "imagePublisher": "MicrosoftWindowsServer",
         "imageOffer": "WindowsServer",
         "OSDiskName": "osdisk",
-        "nicName": "myVnic",
+        "nicName": "[replace(replace(tolower(concat('nic',resourceGroup().name)), '-', ''), '.','')]",
         "addressPrefix": "10.0.0.0/24",
-        "subnetName": "mySubnet",
+        "subnetName": "[replace(replace(tolower(concat('subnet',resourceGroup().name)), '-', ''), '.','')]",
         "subnetPrefix": "10.0.0.0/24",
         "storageAccountType": "Standard_LRS",
-        "publicIPAddressName": "myPublicIP",
+        "publicIPAddressName": "[replace(replace(tolower(concat('pip',resourceGroup().name)), '-', ''), '.','')]",
         "publicIPAddressType": "Dynamic",
         "vmStorageAccountContainerName": "vhds",
         "vmSize": "Standard_A1",
-        "virtualNetworkName": "myVnet",
+        "virtualNetworkName": "[replace(replace(tolower(concat('vnet',resourceGroup().name)), '-', ''), '.','')]",
         "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
         "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
-        "networkSecurityGroupName": "mySG"
+        "networkSecurityGroupName": "[replace(replace(tolower(concat('nsg',resourceGroup().name)), '-', ''), '.','')]"
     },
     "resources": [
         {
@@ -136,10 +141,7 @@
                             }
                         }
                     }
-                ],
-                "dhcpOptions": {
-                    "dnsServers": ["192.168.100.2"]
-                }
+                ]
             }
         },
         {
@@ -152,9 +154,6 @@
                 "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
             ],
             "properties": {
-                "dnsSettings": {
-                    "dnsServers": ["192.168.100.2"]
-                },
                 "ipConfigurations": [
                     {
                         "name": "ipconfig1",

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

@@ -2,21 +2,6 @@
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "newStorageAccountName": {
-      "value": "mystorage001"
-    },
-    "vmName": {
-        "value": "myVM001"
-    },
-    "adminUsername": {
-      "value": "admin123"
-    },
-    "adminPassword": {
-      "value": "GEN-PASSWORD"
-    },
-    "dnsNameForPublicIP": {
-      "value": "mydns001"
-    },
     "windowsOSVersion": {
       "value": "2012-R2-Datacenter"
     }

anti-malware-ext-win/azuredeploy.json

@@ -201,9 +201,9 @@
                 "publisher": "Microsoft.Azure.Security",
                 "type": "IaaSAntimalware",
                 "typeHandlerVersion": "1.4",
-                "autoUpgradeMinorVersion": "true",
+                "autoUpgradeMinorVersion": true,
                 "settings": {
-                    "AntimalwareEnabled": "true",
+                    "AntimalwareEnabled": true,
                     "RealtimeProtectionEnabled": "true",
                     "ScheduledScanSettings": {
                         "isEnabled": "true",

exchange-2016-non-ha/azuredeploy.json

@@ -106,7 +106,6 @@
             }
         },
         {
-
             "apiVersion": "2015-06-15",
             "type": "Microsoft.Network/virtualNetworks",
             "name": "[variables('virtualNetworkName')]",

jetstress-2013-exchange-loadtest/azuredeploy.json

@@ -146,7 +146,6 @@
       }
     },
     {
-
       "apiVersion": "2015-06-15",
       "type": "Microsoft.Network/virtualNetworks",
       "name": "[variables('virtualNetworkName')]",

mesos-windows-jumpbox/azuredeploy.json

@@ -418,7 +418,7 @@
                 "publisher": "Microsoft.Compute",
                 "type": "CustomScriptExtension",
                 "typeHandlerVersion": "1.4",
-                "autoUpgradeMinorVersion": "true",
+                "autoUpgradeMinorVersion": true,
                 "settings": {
                     "fileUris": [],
                     "commandToExecute": "[variables('jumpboxWindowsCustomScript')]"