CustomScript rollout - stage Azure#2

See Azure#2340 for more context. Rolling out CustomScript to more templates. Please do not mind the tabs vs spaces for now. Once the whole rollout completes, I will submit a PR for json indentation.
ahmetb · Aug 22, 2016 · 715dad2 · 715dad2
1 parent ee6efb1
commit 715dad2
Show file tree

Hide file tree

Showing 35 changed files with 167 additions and 146 deletions.
diff --git a/301-dns-forwarder/azuredeploy.json b/301-dns-forwarder/azuredeploy.json
@@ -208,13 +208,14 @@
 		"location": "[variables('location')]",
 		"dependsOn": ["[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"],
 		"properties": {
-			"publisher": "Microsoft.OSTCExtensions",
-			"type": "CustomScriptForLinux",
-			"typeHandlerVersion": "1.3",
+			"publisher": "Microsoft.Azure.Extensions",
+			"type": "CustomScript",
+			"typeHandlerVersion": "2.0",
+			"autoUpgradeMinorVersion": true,
 			"settings": {
 				"fileUris": ["[variables('scriptUrl')]"],
 				"commandToExecute": "[concat('sh forwarderSetup.sh',' ',parameters('forwardIP'),' ', variables('vnetAddressPrefix'))]"
 			}
 		}
 	}]
-}
+}
diff --git a/301-drupal8-vmss-glusterfs-mysql/azuredeploy.json b/301-drupal8-vmss-glusterfs-mysql/azuredeploy.json
@@ -547,10 +547,10 @@
               {
                 "name": "drupalextension",
                 "properties": {
-                  "publisher": "Microsoft.OSTCExtensions",
-                  "type": "CustomScriptForLinux",
-                  "typeHandlerVersion": "1.4",
-                  "autoUpgradeMinorVersion": false,
+                  "publisher": "Microsoft.Azure.Extensions",
+                  "type": "CustomScript",
+                  "typeHandlerVersion": "2.0",
+                  "autoUpgradeMinorVersion": true,
                   "settings": {
                     "fileUris": 
                       [

diff --git a/ansible-advancedlinux/azuredeploy.json b/ansible-advancedlinux/azuredeploy.json
@@ -437,9 +437,10 @@
         "VMsLoop"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.4",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "[variables('customScriptSSHRootUrl')]",

diff --git a/consul-on-ubuntu/azuredeploy.json b/consul-on-ubuntu/azuredeploy.json
@@ -308,18 +308,18 @@
       },
       "type": "Microsoft.Compute/virtualMachines/extensions",
       "properties": {
-        "autoUpgradeMinorVersion": true,
-        "typeHandlerVersion": "1.4",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "[variables('customScriptFilePath')]"
           ]
         },
         "protectedSettings": {
             "commandToExecute": "[concat(variables('customScriptCommandToExecute'),' ', parameters('existingAtlasInfraName'), ' ', parameters('existingAtlasToken'))]"
-        },
-        "type": "CustomScriptForLinux",
-        "publisher": "Microsoft.OSTCExtensions"
+        }
       }
     }
   ]

diff --git a/couchbase-ansible/azuredeploy.json b/couchbase-ansible/azuredeploy.json
@@ -490,9 +490,10 @@
         "VMsLoop"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.4",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "[variables('customScriptSSHRootUrl')]",
@@ -606,9 +607,10 @@
         "VMExtensionsLoop"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.4",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "[variables('customScriptAnsibleUrl')]",

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-A6.json b/couchbase-on-ubuntu/nested/cluster-nodes-A6.json
@@ -219,9 +219,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-disabledA2.json b/couchbase-on-ubuntu/nested/cluster-nodes-disabledA2.json
@@ -179,9 +179,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-disabledD14.json b/couchbase-on-ubuntu/nested/cluster-nodes-disabledD14.json
@@ -459,9 +459,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuA2.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuA2.json
@@ -167,9 +167,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuA6.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuA6.json
@@ -207,9 +207,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuD14.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-ubuntuD14.json
@@ -447,9 +447,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsA2.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsA2.json
@@ -167,9 +167,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsA6.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsA6.json
@@ -207,9 +207,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsD14.json b/couchbase-on-ubuntu/nested/cluster-nodes-jumpbox-windowsD14.json
@@ -447,9 +447,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', parameters('machineSettings').machineNamePrefix, parameters('nodeId'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": "[parameters('vmScripts').scriptsToDownload]",
           "commandToExecute": "[parameters('commandToExecute')]"

diff --git a/dnx-on-ubuntu/azuredeploy.json b/dnx-on-ubuntu/azuredeploy.json
@@ -89,10 +89,10 @@
             "[concat('Microsoft.Compute/virtualMachines/', parameters('vmName') )]"
           ],
           "properties": {
-            "publisher": "Microsoft.OSTCExtensions",
-            "type": "CustomScriptForLinux",
-            "typeHandlerVersion": "1.4",
-            "autoUpgradeMinorVersion": true,
+            "publisher": "Microsoft.Azure.Extensions",
+			"type": "CustomScript",
+			"typeHandlerVersion": "2.0",
+			"autoUpgradeMinorVersion": true,
             "settings": {
               "fileUris": [
                 "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/dnx-on-ubuntu/scripts/post_deployment.sh"
@@ -218,4 +218,4 @@
       "dependsOn": []
     }
   ]
-}
+}
diff --git a/docker-neo4j/azuredeploy.json b/docker-neo4j/azuredeploy.json
@@ -66,7 +66,8 @@
             "ubuntuOSVersion": "15.10",
             "OSDiskName": "osDisk",
             "nsgName": "[concat(parameters('vmName'),'NeoNSG')]",
-            "nicName": "[concat(parameters('vmName'),'NeoNIC')]",             "dockerExtensionName": "DockerExtension",
+            "nicName": "[concat(parameters('vmName'),'NeoNIC')]",
+			"dockerExtensionName": "DockerExtension",
             "azureVMUtilsName": "vmCustomizationExt",
             "azureVMUtilsScriptUrl": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/docker-neo4j/extras/setup_data_disk.sh",
             "addressPrefix": "10.0.0.0/16",
@@ -289,9 +290,9 @@
               "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
             ],
             "properties": {
-              "publisher": "Microsoft.OSTCExtensions",
-              "type": "CustomScriptForLinux",
-              "typeHandlerVersion": "1.2",
+              "publisher": "Microsoft.Azure.Extensions",
+              "type": "CustomScript",
+              "typeHandlerVersion": "2.0",
               "autoUpgradeMinorVersion": true,
               "settings": {
                 "fileUris": [

diff --git a/dokku-vm/azuredeploy.json b/dokku-vm/azuredeploy.json
@@ -220,10 +220,10 @@
                 "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
             ],
             "properties": {
-                "publisher": "Microsoft.OSTCExtensions",
-                "type": "CustomScriptForLinux",
-                "typeHandlerVersion": "1.5",
-                "autoUpgradeMinorVersion": true,
+                "publisher": "Microsoft.Azure.Extensions",
+				"type": "CustomScript",
+				"typeHandlerVersion": "2.0",
+				"autoUpgradeMinorVersion": true,
                 "settings": {
                     "fileUris": [
                         "[concat(variables('githubPath'),'deploy_dokku.sh')]"

diff --git a/drone-ubuntu-vm/azuredeploy.json b/drone-ubuntu-vm/azuredeploy.json
@@ -192,9 +192,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.2",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/drone-ubuntu-vm/install_drone.sh"

diff --git a/emercoin-ubuntu/azuredeploy.json b/emercoin-ubuntu/azuredeploy.json
@@ -260,10 +260,10 @@
         "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
       ],
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.4",
-        "autoUpgradeMinorVersion": true,
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/emercoin-ubuntu/configure-emercoin.sh"
@@ -275,4 +275,4 @@
       }
     }
   ]
-}
+}
diff --git a/hazelcast-vm-cluster/azuredeploy.json b/hazelcast-vm-cluster/azuredeploy.json
@@ -359,9 +359,10 @@
       "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), '0')]"
     ],
     "properties": {
-      "publisher": "Microsoft.OSTCExtensions",
-      "type": "CustomScriptForLinux",
-      "typeHandlerVersion": "1.4",
+      "publisher": "Microsoft.Azure.Extensions",
+      "type": "CustomScript",
+      "typeHandlerVersion": "2.0",
+      "autoUpgradeMinorVersion": true,
       "settings": {
         "fileUris": "[variables('bootstrapFiles')]",
         "commandToExecute": "[concat('sh bootstrap_hazelcast ', parameters('minHeapSizeInGB'), ' ', parameters('maxHeapSizeInGB'), ' ', parameters('clusterUserName'), ' ', parameters('clusterPassword'), ' ', subscription().subscriptionId, ' ', parameters('aadClientId'), ' ',  parameters('aadClientSecret'), ' ',  parameters('aadTenantId'), ' ', resourceGroup().name, ' ', parameters('clusterName'))]"
@@ -377,9 +378,10 @@
       "createVms"
     ],
     "properties": {
-      "publisher": "Microsoft.OSTCExtensions",
-      "type": "CustomScriptForLinux",
-      "typeHandlerVersion": "1.4",
+      "publisher": "Microsoft.Azure.Extensions",
+      "type": "CustomScript",
+      "typeHandlerVersion": "2.0",
+      "autoUpgradeMinorVersion": true,
       "settings": {
         "fileUris": "[variables('bootstrapFiles')]",
         "commandToExecute": "[concat('sh bootstrap_hazelcast ', parameters('minHeapSizeInGB'), ' ', parameters('maxHeapSizeInGB'), ' ', parameters('clusterUserName'), ' ', parameters('clusterPassword'), ' ', subscription().subscriptionId, ' ', parameters('aadClientId'), ' ',  parameters('aadClientSecret'), ' ',  parameters('aadTenantId'), ' ', resourceGroup().name, ' ', parameters('clusterName'))]"

diff --git a/intel-lustre-client-server/azuredeploy.json b/intel-lustre-client-server/azuredeploy.json
@@ -759,10 +759,10 @@
 			"[concat('Microsoft.Compute/virtualMachines/', concat(parameters('vmNamePrefix'), 'mgs'))]"
 		],
 		"properties": {
-			"publisher": "Microsoft.OSTCExtensions",
-			"type": "CustomScriptForLinux",
-			"typeHandlerVersion": "1.5",
-			"autoUpgradeMinorVersion":true,
+			"publisher": "Microsoft.Azure.Extensions",
+			"type": "CustomScript",
+			"typeHandlerVersion": "2.0",
+			"autoUpgradeMinorVersion": true,
 			"settings": {
 				"fileUris": [
 					"[variables('scriptUrlLustre')]"
@@ -1223,4 +1223,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/intel-lustre-clients-on-centos/azuredeploy.json b/intel-lustre-clients-on-centos/azuredeploy.json
@@ -392,9 +392,10 @@
         "count": "[parameters('clientCount')]"
       },
       "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "CustomScriptForLinux",
-        "typeHandlerVersion": "1.5",
+        "publisher": "Microsoft.Azure.Extensions",
+		"type": "CustomScript",
+		"typeHandlerVersion": "2.0",
+		"autoUpgradeMinorVersion": true,
         "settings": {
           "fileUris": [
             "[variables('scriptUrlLustreClient')]"
@@ -413,4 +414,4 @@
       }
     }
   }
-}
+}