Skip to content

Commit

Permalink
CustomScript rollout - stage #4
Browse files Browse the repository at this point in the history 
See #2340 for more context.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
  • Loading branch information
@ahmetb
ahmetb committed Aug 22, 2016
1 parent ee6efb1 commit 68e6902
Show file tree
Hide file tree
Showing 74 changed files with 307 additions and 285 deletions.
6 changes: 3 additions & 3 deletions 201-customscript-extension-azure-storage-on-ubuntu/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,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": "[split(parameters('fileUris'), ' ')]",
Expand Down
6 changes: 3 additions & 3 deletions 201-customscript-extension-public-storage-on-ubuntu/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": "[split(parameters('fileUris'), ' ')]",
Expand Down
6 changes: 3 additions & 3 deletions 201-dependency-between-scripts-using-extensions/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,9 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
6 changes: 3 additions & 3 deletions 201-discover-private-ip-dynamically/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@
"[concat('Microsoft.Network/networkInterfaces/', variables('nicName'), '0')]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
7 changes: 4 additions & 3 deletions 201-traffic-manager-vm/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,10 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), copyIndex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.3",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"commandToExecute": "sudo bash -c 'apt-get update && apt-get -y install apache2' "
}
Expand Down
6 changes: 3 additions & 3 deletions 201-vm-linux-dynamic-data-disks/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,9 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('masterVMName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
8 changes: 4 additions & 4 deletions 201-vmss-lapstack-autoscale/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@
{
"name": "lapextension",
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"autoUpgradeMinorVersion": false,
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/201-vmss-lapstack-autoscale/install_lap.sh",
Expand Down
6 changes: 3 additions & 3 deletions 301-custom-images-at-scale/download.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,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": [
Expand Down
6 changes: 3 additions & 3 deletions 301-custom-images-at-scale/upload.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,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": [
Expand Down
7 changes: 4 additions & 3 deletions bosh-setup/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": "[variables('filesToDownload')]"
},
Expand Down
6 changes: 3 additions & 3 deletions centos-2nics-lb-cluster/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,9 @@
"[concat('Microsoft.Compute/virtualMachines/', 'myvm', copyIndex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.3",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
9 changes: 5 additions & 4 deletions chef-server-compliance-delivery-devops/nested/chefp2p-chefenvironment.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('chefprefix'),parameters('vmNameChefEnvironment'),copyindex(),'/extensions/',variables('vmExtensionName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[parameters('chefnodeCustomScripturl')]"
Expand All @@ -436,4 +437,4 @@
}
}
]
}
}
9 changes: 5 additions & 4 deletions chef-server-compliance-delivery-devops/nested/chefp2p-chefserver.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@

],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.5",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[parameters('chefServerScriptUrl')]"
Expand Down Expand Up @@ -314,4 +315,4 @@
"value": "[concat('https://',reference(resourceId('Microsoft.Network/publicIPAddresses',parameters('publicIPAddressNameChefServer'))).dnsSettings.fqdn)]"
}
}
}
}
9 changes: 5 additions & 4 deletions chef-server-compliance-delivery-devops/nested/chefp2p-complianceserver.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vm-name'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.2",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[concat(parameters('baseUrl'),'/scripts/configurl.sh')]"
Expand All @@ -249,4 +250,4 @@
}
}
]
}
}
23 changes: 13 additions & 10 deletions chef-server-compliance-delivery-devops/nested/chefp2p-delivery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vmNameChefProvision'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.2",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[variables('clientazureVMUtilsScriptUrl')]"
Expand All @@ -277,9 +278,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vmNameChefdelivery'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.2",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[variables('clientazureVMUtilsScriptUrl1')]"
Expand All @@ -297,9 +299,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vmNameChefbuild1'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.2",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
"[variables('clientazureVMUtilsScriptUrl1')]"
Expand Down Expand Up @@ -484,4 +487,4 @@
"dependsOn": []
}
]
}
}
10 changes: 5 additions & 5 deletions chef-server-compliance-delivery-devops/nested/chefp2p-orchestrator-server-setup-cc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
"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": [
"https://raw.githubusercontent.com/sysgain/cloudtry-p2p-public-artifacts/master/scripts/p2porchAllinOneCC.sh"
],
"commandToExecute": "[concat('sh p2porchAllinOneCC.sh ',parameters('keyName'),' ', parameters('componentAdminUsername'),' ',parameters('componentAdminPassword'),' ',parameters('componentBaseUrl'),' ',parameters('orchestratorbaseurl'),' ',parameters('email'),' ',parameters('component'))]"
}
}
}
}
]
}
}
6 changes: 3 additions & 3 deletions cloudera-on-centos/data-node-ds13.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), copyIndex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
6 changes: 3 additions & 3 deletions cloudera-on-centos/data-node-ds14.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,9 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), copyIndex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
6 changes: 3 additions & 3 deletions cloudera-on-centos/master-node.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,9 @@
"[concat('Microsoft.Compute/virtualMachines/', variables('vmName'), copyIndex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
6 changes: 3 additions & 3 deletions cloudera-on-centos/setup-cloudera.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"apiVersion": "[parameters('resourceAPIVersion')]",
"location": "[resourceGroup().location]",
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": [
Expand Down
7 changes: 4 additions & 3 deletions concourse-ci/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,10 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": "[variables('filesToDownload')]"
},
Expand Down
6 changes: 3 additions & 3 deletions datastax/nested/nodes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@
"[concat('Microsoft.Compute/virtualMachines/', parameters('namespace'), 'vm', copyindex())]"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": "[parameters('osSettings').scripts]",
Expand Down
6 changes: 3 additions & 3 deletions datastax/nested/opscenter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@
"Microsoft.Compute/virtualMachines/opscenter"
],
"properties": {
"publisher": "Microsoft.OSTCExtensions",
"type": "CustomScriptForLinux",
"typeHandlerVersion": "1.4",
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"fileUris": "[parameters('osSettings').scripts]",
Expand Down
Loading

2 comments on commit 68e6902

@pgroene
Copy link

@pgroene pgroene commented on 68e6902 Oct 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change seem to break the deployment of cloudera-on-centos/setup-cloudera.json

In protectedSettings is Item not supported

@ahmetb
Copy link
Contributor Author

@ahmetb ahmetb commented on 68e6902 Oct 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pgroene can you please open a separate issue with details and ping me there?

Please sign in to comment.