diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0d1493fce081..2309c196e1ad 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -43,22 +43,23 @@ To make sure your template is added to Azure.com index, please follow these guid 9. Name **variables** using this scheme **templateScenarioResourceName** (e.g. simpleLinuxVMVNET, userRoutesNSG, elasticsearchPublicIP etc.) that describe the scenario rather. This ensures when a user browses all the resources in the Portal there aren't a bunch of resources with the same name (e.g. myVNET, myPublicIP, myNSG) 10. **Storage account names** need to be lower case and can't contain hyphens (-) in addition to other domain name restrictions. These also need to be globally unique. 11. **Passwords** must be passed into parameters of type `securestring`. - * Passwords must also be passed to customScriptExtension using the `commandToExecute` property in `protectedSettings`. This will look like below + * Passwords must also be passed to Custom Script Extension using the `commandToExecute` property in `protectedSettings`. This will look like below: ``` - "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", - "settings": { - "fileUris": [ - "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/lamp-app/install_lamp.sh" - ] - }, - "protectedSettings": { - "commandToExecute": "[concat('sh install_lamp.sh ', parameters('mySqlPassword'))]" - } - } + "properties": { + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, + "settings": { + "fileUris": [ + "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/lamp-app/install_lamp.sh" + ] + }, + "protectedSettings": { + "commandToExecute": "[concat('sh install_lamp.sh ', parameters('mySqlPassword'))]" + } + } ``` 12. Every parameter in the template must have the **lower-case description** tag specified using the metadata property. This looks like below @@ -269,4 +270,4 @@ Server Error:{ } } } -``` \ No newline at end of file +``` diff --git a/1-CONTRIBUTION-GUIDE/best-practices.md b/1-CONTRIBUTION-GUIDE/best-practices.md index 022241fd222b..0f53482e6bef 100644 --- a/1-CONTRIBUTION-GUIDE/best-practices.md +++ b/1-CONTRIBUTION-GUIDE/best-practices.md @@ -129,8 +129,10 @@ The following guidelines are relevant to the main deployment template and nested ``` "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "version": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[concat(variables('template').assets, '/lamp-app/install_lamp.sh')]" diff --git a/201-dependency-between-scripts-using-extensions/install-mongo.json b/201-dependency-between-scripts-using-extensions/install-mongo.json index 8627ad86efe8..a5a5b71b2b8d 100644 --- a/201-dependency-between-scripts-using-extensions/install-mongo.json +++ b/201-dependency-between-scripts-using-extensions/install-mongo.json @@ -13,9 +13,9 @@ "apiVersion": "2015-05-01-preview", "location": "[resourceGroup().location]", "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/201-vmss-bottle-autoscale/azuredeploy.json b/201-vmss-bottle-autoscale/azuredeploy.json index e5d71ddbe1f4..1dd88d85dce9 100644 --- a/201-vmss-bottle-autoscale/azuredeploy.json +++ b/201-vmss-bottle-autoscale/azuredeploy.json @@ -268,9 +268,9 @@ { "name": "lapextension", "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "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 index b396df9b5100..e018d2465cfa 100644 --- a/ansible-advancedlinux/azuredeploy.json +++ b/ansible-advancedlinux/azuredeploy.json @@ -552,9 +552,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/influx-blockchain-ubuntu/azuredeploy.json b/influx-blockchain-ubuntu/azuredeploy.json index 6efce863e5b0..a67eea712d95 100644 --- a/influx-blockchain-ubuntu/azuredeploy.json +++ b/influx-blockchain-ubuntu/azuredeploy.json @@ -190,9 +190,9 @@ "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/intel-lustre-client-server/azuredeploy.json b/intel-lustre-client-server/azuredeploy.json index eed8fc24da5e..c35fec345f5a 100644 --- a/intel-lustre-client-server/azuredeploy.json +++ b/intel-lustre-client-server/azuredeploy.json @@ -859,9 +859,9 @@ "[concat('Microsoft.Compute/virtualMachines/', parameters('vmNamePrefix'), 'mgs', '/extensions/init')]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion":true, "settings": { "fileUris": [ @@ -992,9 +992,9 @@ "count": "[parameters('ossCount')]" }, "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion":true, "settings": { "fileUris": [ @@ -1174,9 +1174,9 @@ "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": [ diff --git a/intel-lustre-client-server/monitoring.json b/intel-lustre-client-server/monitoring.json index 47b0a89db13e..edb43b81fd3c 100644 --- a/intel-lustre-client-server/monitoring.json +++ b/intel-lustre-client-server/monitoring.json @@ -58,9 +58,10 @@ "name": "[concat(parameters('vmNamePrefix'), 'mds', '/init')]", "location": "[parameters('location')]", "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.3", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[parameters('scriptUrlMonitoring')]" @@ -79,9 +80,10 @@ "count": "[parameters('ossCount')]" }, "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.3", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[parameters('scriptUrlMonitoring')]" @@ -96,9 +98,10 @@ "name": "[concat(parameters('vmNamePrefix'), 'mgs', '/init')]", "location": "[parameters('location')]", "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.3", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[parameters('scriptUrlMonitoring')]" @@ -108,4 +111,4 @@ } } ] -} \ No newline at end of file +} diff --git a/kafka-ubuntu-multidisks/README.md b/kafka-ubuntu-multidisks/README.md index 98e6ceb914f9..bc72f8ee2bea 100644 --- a/kafka-ubuntu-multidisks/README.md +++ b/kafka-ubuntu-multidisks/README.md @@ -20,7 +20,7 @@ The template creates the following deployment resources: * Storage accounts to store VM data disks * Public IP address for accessing the jumpbox via ssh * Network interface card for each VM -* Multiple remotely-hosted CustomScriptForLinux extensions to strip the data disks and to install and configure Kafka services +* Multiple remotely-hosted Custom Script Extensions to strip the data disks and to install and configure Kafka services Assuming your domainName parameter was "kafkajumpbox" and region was "West US" * Kafka servers will be deployed at IP address prefix in the subnet: 10.0.2.10,10.0.2.11,10.0.2.12, etc. diff --git a/kafka-ubuntu-multidisks/zookeeper-resources.json b/kafka-ubuntu-multidisks/zookeeper-resources.json index 815f45e3277b..719d736d2da1 100644 --- a/kafka-ubuntu-multidisks/zookeeper-resources.json +++ b/kafka-ubuntu-multidisks/zookeeper-resources.json @@ -113,9 +113,9 @@ "count": "[variables('vmCount')]" }, "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": "[parameters('osSettings').scripts]", diff --git a/lap-neo4j-ubuntu/nested/lanplap-resources.json b/lap-neo4j-ubuntu/nested/lanplap-resources.json index 0a80aec22920..7f9f88e35834 100644 --- a/lap-neo4j-ubuntu/nested/lanplap-resources.json +++ b/lap-neo4j-ubuntu/nested/lanplap-resources.json @@ -172,12 +172,12 @@ "[concat('Microsoft.Compute/virtualMachines/', concat(parameters('namespace'), concat(parameters('vmbasename'), 'vm')))]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { - "fileUris": "[parameters('osSettings').scripts]", + "fileUris": "[parameters('osSettings').scripts]", "commandToExecute": "sudo bash install-lap.sh" } } diff --git a/lap-neo4j-ubuntu/nested/lanpneo4j-resources.json b/lap-neo4j-ubuntu/nested/lanpneo4j-resources.json index aba30bad0267..d7f496dfb44f 100644 --- a/lap-neo4j-ubuntu/nested/lanpneo4j-resources.json +++ b/lap-neo4j-ubuntu/nested/lanpneo4j-resources.json @@ -110,9 +110,9 @@ "[concat('Microsoft.Network/networkInterfaces/', parameters('namespace'), parameters('vmbasename'), 'nic')]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.5", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": "[parameters('osSettings').scripts]", diff --git a/memcached-multi-vm-ubuntu/README.md b/memcached-multi-vm-ubuntu/README.md index e842560056ce..80309410f652 100644 --- a/memcached-multi-vm-ubuntu/README.md +++ b/memcached-multi-vm-ubuntu/README.md @@ -15,7 +15,7 @@ The template creates the following deployment resources: * Public IP address (named publicip) for accessing the Apache web server and the hosted PHP test page * Network Interface Card (NIC) for Apache web (named nicapache) * Multiple Network Interface Cards (NICs) for memcached servers (named memcachednic0, memcachednic1, etc.) -* One remotely-hosted CustomScriptForLinux (install_apache.sh with passed in parameters) extension to install Apache, PHP5, memcached PHP extension, and the index.php test page on the Apache VM -* Multiple remotely-hosted CustomScriptForLinux (install_memcached.sh with passed in parameters) extensions to install and configure the memcached service on each of the numberOfMemcachedInstances VMs +* One remotely-hosted CustomScript (install_apache.sh with passed in parameters) extension to install Apache, PHP5, memcached PHP extension, and the index.php test page on the Apache VM +* Multiple remotely-hosted CustomScript (install_memcached.sh with passed in parameters) extensions to install and configure the memcached service on each of the numberOfMemcachedInstances VMs NOTE: In the current version of the template, Apache test page is dynamically configured with the IP addresses of the memcached servers by assuming that they are always deployed into an empty Subnet-Memcached and that the first server is at x.x.x.4, second at x.x.x.5, third at x.x.x.6, etc. IP addresses. diff --git a/mongodb-nodejs-high-availability/frontend-resource.json b/mongodb-nodejs-high-availability/frontend-resource.json index d3754d97ed90..8dca9dafa802 100644 --- a/mongodb-nodejs-high-availability/frontend-resource.json +++ b/mongodb-nodejs-high-availability/frontend-resource.json @@ -134,7 +134,7 @@ }, { "type": "Microsoft.Compute/virtualMachines/extensions", - "name": "[concat(variables('vmName'), '/CustomScriptForLinux')]", + "name": "[concat(variables('vmName'), '/CustomScript')]", "apiVersion": "2015-05-01-preview", "location": "[resourceGroup().location]", "dependsOn": [ diff --git a/nxt-blockchain-ubuntu/azuredeploy.json b/nxt-blockchain-ubuntu/azuredeploy.json index 4bb1f6c772c1..89b89063e9ec 100755 --- a/nxt-blockchain-ubuntu/azuredeploy.json +++ b/nxt-blockchain-ubuntu/azuredeploy.json @@ -205,9 +205,9 @@ "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/openedx-scalable-ubuntu/azuredeploy.json b/openedx-scalable-ubuntu/azuredeploy.json index b159df904365..2afae96ee3ed 100644 --- a/openedx-scalable-ubuntu/azuredeploy.json +++ b/openedx-scalable-ubuntu/azuredeploy.json @@ -629,9 +629,9 @@ "[concat('Microsoft.Compute/virtualMachines/', variables('appVmName'), '0')]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.3", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/postgresql-on-ubuntu/README.md b/postgresql-on-ubuntu/README.md index 4163f206f17e..78b83420eaa7 100644 --- a/postgresql-on-ubuntu/README.md +++ b/postgresql-on-ubuntu/README.md @@ -14,7 +14,7 @@ The template creates the following deployment resources: * Storage accounts to store VM data disks * Public IP address for accessing the jumpbox via ssh * Network interface card for each VM -* Multiple remotely-hosted CustomScriptForLinux extensions to strip the data disks and to install and configure PostgreSQL services +* Multiple remotely-hosted Custom Script Extensions to strip the data disks and to install and configure PostgreSQL services NOTE: To access the PostgreSQL servers, you need to use the externally accessible jumpbox VM and ssh from it into the backend servers. diff --git a/stampery-trailbot-ubuntu/azuredeploy.json b/stampery-trailbot-ubuntu/azuredeploy.json index e87c59d127eb..2b3634ae39bd 100644 --- a/stampery-trailbot-ubuntu/azuredeploy.json +++ b/stampery-trailbot-ubuntu/azuredeploy.json @@ -197,9 +197,9 @@ "[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/ubuntu-apache-test-page/azuredeploy.json b/ubuntu-apache-test-page/azuredeploy.json index 383da8022fd0..ae9c68644f3f 100644 --- a/ubuntu-apache-test-page/azuredeploy.json +++ b/ubuntu-apache-test-page/azuredeploy.json @@ -293,9 +293,9 @@ "displayName": "PrepareServer" }, "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ diff --git a/vsts-tomcat-redhat-vm/azuredeploy.json b/vsts-tomcat-redhat-vm/azuredeploy.json index 9566bd23967b..30d2a4d8f0bb 100755 --- a/vsts-tomcat-redhat-vm/azuredeploy.json +++ b/vsts-tomcat-redhat-vm/azuredeploy.json @@ -261,10 +261,10 @@ "location": "[resourceGroup().location]", "dependsOn": ["[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": [ "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/vsts-tomcat-redhat-vm/scripts/tomcat-setup-redhat.sh" diff --git a/vsts-tomcat-ubuntu-vm/azuredeploy.json b/vsts-tomcat-ubuntu-vm/azuredeploy.json index fba603d7f1bb..d28275f1d736 100755 --- a/vsts-tomcat-ubuntu-vm/azuredeploy.json +++ b/vsts-tomcat-ubuntu-vm/azuredeploy.json @@ -261,10 +261,10 @@ "location": "[resourceGroup().location]", "dependsOn": ["[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": [ "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/vsts-tomcat-ubuntu-vm/scripts/tomcat-setup-ubuntu.sh" diff --git a/zabbix-monitoring-cluster/nested/monitoringAgentByVms.json b/zabbix-monitoring-cluster/nested/monitoringAgentByVms.json index 8528fd195e22..cccb5e2b0fd8 100644 --- a/zabbix-monitoring-cluster/nested/monitoringAgentByVms.json +++ b/zabbix-monitoring-cluster/nested/monitoringAgentByVms.json @@ -36,9 +36,10 @@ "apiVersion": "2015-06-15", "location": "[variables('location')]", "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[concat(parameters('_artifactsLocation'), '/scripts/setup')]" @@ -50,4 +51,4 @@ } } ] -} \ No newline at end of file +} diff --git a/zabbix-monitoring-cluster/nested/monitoringServer.json b/zabbix-monitoring-cluster/nested/monitoringServer.json index 966c36dd5e66..83dd0dc14834 100644 --- a/zabbix-monitoring-cluster/nested/monitoringServer.json +++ b/zabbix-monitoring-cluster/nested/monitoringServer.json @@ -215,9 +215,10 @@ "[variables('vmName')]" ], "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.4", + "publisher": "Microsoft.Azure.Extensions", + "type": "CustomScript", + "typeHandlerVersion": "2.0", + "autoUpgradeMinorVersion": true, "settings": { "fileUris": [ "[concat(parameters('_artifactsLocation'), '/scripts/setup')]", @@ -242,4 +243,4 @@ "value": "[reference(variables('nicName')).ipConfigurations[0].properties.privateIPAddress]" } } -} \ No newline at end of file +}