From 70f305a6f75dbc5af85770d362d8476c060bca95 Mon Sep 17 00:00:00 2001 From: Trent Swanson Date: Mon, 27 Apr 2015 00:30:47 -0700 Subject: [PATCH 1/5] deployment optimizations --- .../opscenter-install-resources.json | 0 datastax-on-ubuntu/opscenter-resources.json | 19 ------------------- 2 files changed, 19 deletions(-) create mode 100644 datastax-on-ubuntu/opscenter-install-resources.json diff --git a/datastax-on-ubuntu/opscenter-install-resources.json b/datastax-on-ubuntu/opscenter-install-resources.json new file mode 100644 index 0000000..e69de29 diff --git a/datastax-on-ubuntu/opscenter-resources.json b/datastax-on-ubuntu/opscenter-resources.json index 815c8cc..69cc909 100644 --- a/datastax-on-ubuntu/opscenter-resources.json +++ b/datastax-on-ubuntu/opscenter-resources.json @@ -146,25 +146,6 @@ ] } } - }, - { - "type": "Microsoft.Compute/virtualMachines/extensions", - "name": "[concat(parameters('namespace'), 'vm', '/installopscenter')]", - "apiVersion": "2015-05-01-preview", - "location": "[parameters('region')]", - "dependsOn": [ - "[concat('Microsoft.Compute/virtualMachines/', parameters('namespace'), 'vm')]", - "[concat('Microsoft.Network/networkInterfaces/', parameters('namespace'), 'nic')]" - ], - "properties": { - "publisher": "Microsoft.OSTCExtensions", - "type": "CustomScriptForLinux", - "typeHandlerVersion": "1.2", - "settings": { - "fileUris": "[parameters('osSettings').scripts]", - "commandToExecute": "[concat('bash opscenter.sh -n \"', parameters('opsCenterSettings').clusterName , '\" -u ', parameters('adminUsername'), ' -p ', parameters('adminPassword'), ' -k ' , parameters('opsCenterSettings').adminPassword , ' -ed ', parameters('opsCenterSettings').nodeList)]" - } - } } ], "outputs": {} From b0cfa4fa9b4a7c30a10476438a37c0eef96a2227 Mon Sep 17 00:00:00 2001 From: Trent Swanson Date: Mon, 27 Apr 2015 01:07:02 -0700 Subject: [PATCH 2/5] performance updates --- .../opscenter-install-resources.json | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/datastax-on-ubuntu/opscenter-install-resources.json b/datastax-on-ubuntu/opscenter-install-resources.json index e69de29..3af8178 100644 --- a/datastax-on-ubuntu/opscenter-install-resources.json +++ b/datastax-on-ubuntu/opscenter-install-resources.json @@ -0,0 +1,62 @@ +{ + "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "region": { + "type": "string" + }, + "storageAccountName": { + "type": "string" + }, + "adminUsername": { + "type": "string" + }, + "adminPassword": { + "type": "securestring" + }, + "namespace": { + "type": "string" + }, + "osSettings": { + "type": "object" + }, + "vmSize": { + "type": "string" + }, + "subnet": { + "type": "object" + }, + "staticIp": { + "type": "string" + }, + "opsCenterSettings": { + "type": "object" + }, + "dnsName": { + "type": "string" + } + }, + "variables": { + "subnetRef": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('subnet').vnet), '/subnets/', parameters('subnet').name)]", + "publicIpName": "[concat(parameters('namespace'), 'PublicIp')]", + "publicIpRef": "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIpName'))]" + }, + "resources": [ + { + "type": "Microsoft.Compute/virtualMachines/extensions", + "name": "[concat(parameters('namespace'), 'vm', '/installopscenter')]", + "apiVersion": "2015-05-01-preview", + "location": "[parameters('region')]", + "properties": { + "publisher": "Microsoft.OSTCExtensions", + "type": "CustomScriptForLinux", + "typeHandlerVersion": "1.2", + "settings": { + "fileUris": "[parameters('osSettings').scripts]", + "commandToExecute": "[concat('bash opscenter.sh -n \"', parameters('opsCenterSettings').clusterName , '\" -u ', parameters('adminUsername'), ' -p ', parameters('adminPassword'), ' -k ' , parameters('opsCenterSettings').adminPassword , ' -ed ', parameters('opsCenterSettings').nodeList)]" + } + } + } + ], + "outputs": {} +} \ No newline at end of file From 569a6113e1f0874d719a8d29bdd9f406b0850739 Mon Sep 17 00:00:00 2001 From: Trent Swanson Date: Mon, 27 Apr 2015 01:39:43 -0700 Subject: [PATCH 3/5] deployment performance improvements --- .../opscenter-install-resources.json | 18 ------------------ datastax-on-ubuntu/opscenter-resources.json | 3 --- 2 files changed, 21 deletions(-) diff --git a/datastax-on-ubuntu/opscenter-install-resources.json b/datastax-on-ubuntu/opscenter-install-resources.json index 3af8178..e14f1c8 100644 --- a/datastax-on-ubuntu/opscenter-install-resources.json +++ b/datastax-on-ubuntu/opscenter-install-resources.json @@ -5,9 +5,6 @@ "region": { "type": "string" }, - "storageAccountName": { - "type": "string" - }, "adminUsername": { "type": "string" }, @@ -20,26 +17,11 @@ "osSettings": { "type": "object" }, - "vmSize": { - "type": "string" - }, - "subnet": { - "type": "object" - }, - "staticIp": { - "type": "string" - }, "opsCenterSettings": { "type": "object" - }, - "dnsName": { - "type": "string" } }, "variables": { - "subnetRef": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('subnet').vnet), '/subnets/', parameters('subnet').name)]", - "publicIpName": "[concat(parameters('namespace'), 'PublicIp')]", - "publicIpRef": "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIpName'))]" }, "resources": [ { diff --git a/datastax-on-ubuntu/opscenter-resources.json b/datastax-on-ubuntu/opscenter-resources.json index 69cc909..9d2e9fd 100644 --- a/datastax-on-ubuntu/opscenter-resources.json +++ b/datastax-on-ubuntu/opscenter-resources.json @@ -29,9 +29,6 @@ "staticIp": { "type": "string" }, - "opsCenterSettings": { - "type": "object" - }, "dnsName": { "type": "string" } From 556df953dbdc4340f91e2dd4c9c32e6058d171d2 Mon Sep 17 00:00:00 2001 From: Trent Swanson Date: Mon, 27 Apr 2015 01:57:27 -0700 Subject: [PATCH 4/5] deployment performance improvements --- datastax-on-ubuntu/azuredeploy.json | 39 ++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/datastax-on-ubuntu/azuredeploy.json b/datastax-on-ubuntu/azuredeploy.json index 9ea7ba9..ec73bb4 100644 --- a/datastax-on-ubuntu/azuredeploy.json +++ b/datastax-on-ubuntu/azuredeploy.json @@ -78,10 +78,11 @@ } }, "variables": { - "templateBaseUrl": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/datastax-on-ubuntu/", + "templateBaseUrl": "https://raw.githubusercontent.com/trentmswanson/azure-quickstart-templates/master/datastax-on-ubuntu/", "sharedTemplateUrl": "[concat(variables('templateBaseUrl'), 'shared-resources.json')]", "clusterNodesTemplateUrl": "[concat(variables('templateBaseUrl'), 'ephemeral-nodes-resources.json')]", "opsCenterTemplateUrl": "[concat(variables('templateBaseUrl'), 'opscenter-resources.json')]", + "opsCenterInstallTemplateUrl": "[concat(variables('templateBaseUrl'), 'opscenter-install-resources.json')]", "opsCenterVmSize": "Standard_A1", "networkSettings": { "virtualNetworkName": "[parameters('virtualNetworkName')]", @@ -192,9 +193,6 @@ "name": "ops-center-nodes", "type": "Microsoft.Resources/deployments", "apiVersion": "2015-01-01", - "dependsOn": [ - "[concat('Microsoft.Resources/deployments/', 'cluster-nodes')]" - ], "properties": { "mode": "Incremental", "templateLink": { @@ -229,6 +227,39 @@ "vmSize": { "value": "[variables('opsCenterVmSize')]" }, + "osSettings": { + "value": "[variables('osSettings')]" + } + } + } + }, + { + "name": "ops-center-install-nodes", + "type": "Microsoft.Resources/deployments", + "apiVersion": "2015-01-01", + "dependsOn": [ + "[concat('Microsoft.Resources/deployments/', 'cluster-nodes')]", + "[concat('Microsoft.Resources/deployments/', 'ops-center-nodes')]" + ], + "properties": { + "mode": "Incremental", + "templateLink": { + "uri": "[variables('opsCenterInstallTemplateUrl')]", + "contentVersion": "1.0.0.0" + }, + "parameters": { + "adminUsername": { + "value": "[parameters('adminUsername')]" + }, + "adminPassword": { + "value": "[parameters('adminPassword')]" + }, + "namespace": { + "value": "opc" + }, + "region": { + "value": "[parameters('region')]" + }, "osSettings": { "value": "[variables('osSettings')]" }, From a72440b8b1d49b99e8c980b821754c1011487b0a Mon Sep 17 00:00:00 2001 From: Trent Swanson Date: Mon, 27 Apr 2015 07:41:29 -0700 Subject: [PATCH 5/5] fixed bug in 8-disk configuration --- postgresql-on-ubuntu/database-8disk-resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql-on-ubuntu/database-8disk-resources.json b/postgresql-on-ubuntu/database-8disk-resources.json index 251a291..4655318 100644 --- a/postgresql-on-ubuntu/database-8disk-resources.json +++ b/postgresql-on-ubuntu/database-8disk-resources.json @@ -170,7 +170,7 @@ "createOption": "Empty" }, { - "name": "datadisk7", + "name": "datadisk8", "diskSizeGB": "[parameters('machineSettings').diskSize]", "lun": 7, "vhd": {