merge from develop

Author: srimathiS

101-linux-customscript-ext/azuredeploy.json

@@ -6,9 +6,9 @@
       "type": "string",
       "metadata": {
         "description": "Name of the existing VM to apply Linux custom script to"
-      }
-    }
-
+      },
+      "defaultValue": "[concat('vm', resourceGroup().name)]"
+    }    
   },
   "variables": {
     "apiVersion": {
@@ -27,6 +27,7 @@
         "publisher": "Microsoft.OSTCExtensions",
         "type": "CustomScriptForLinux",
         "typeHandlerVersion": "1.3",
+        "autoUpgradeMinorVersion": "true",
         "settings": {
           "commandToExecute": "ifconfig"
         }

101-linux-customscript-ext/azuredeploy.parameters.json

@@ -1,9 +1,5 @@
 {
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
-  "parameters": {
-    "vmName": {
-        "value": "myVM001"
-    }
-  }
-}
+  "parameters": { }
+}

101-linux-docker-extension/azuredeploy.json

@@ -6,7 +6,8 @@
       "type": "string",
       "metadata": {
         "description": "Name of the existing VM to apply Docker extension to"
-      }
+      },
+      "defaultValue": "[concat('vm', resourceGroup().name)]"
     }
 
   },

101-linux-docker-extension/azuredeploy.parameters.json

@@ -1,9 +1,5 @@
 {
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
-  "parameters": {
-    "vmName": {
-        "value": "myVM001"
-    }
-  }
-}
+  "parameters": { }
+}

101-linux-vmaccess-ext/azuredeploy.json

@@ -6,7 +6,8 @@
       "type": "string",
       "metadata": {
         "description": "Name of the existing Linux VM to modify"
-      }
+      },
+      "defaultValue": "[concat('vm', resourceGroup().name)]"
     },
     "username": {
       "type": "string",
@@ -37,7 +38,8 @@
       "properties": {
         "publisher": "Microsoft.OSTCExtensions",
         "type": "VMAccessForLinux",
-        "typeHandlerVersion": "1.3",
+        "typeHandlerVersion": "1.4",
+        "autoUpgradeMinorVersion": "true",
         "settings": { },
         "protectedSettings": {
           "username": "[parameters('username')]",

101-linux-vmaccess-ext/azuredeploy.parameters.json

@@ -2,14 +2,11 @@
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "vmName": {
-        "value": "myVM001"
-    },
     "username": {
         "value": "Test"
     },
     "password": {
       "value": "GEN-PASSWORD"
     }
   }
-}
+}