finishing lb fixes for changes

elasticsearch/README.md

@@ -8,8 +8,6 @@ This template deploys an Elasticsearch cluster on Virtual Machines and uses temp
 
 This template also deploys a Storage Account, Virtual Network, Availability Sets, Public IP addresses, Load Balancer, and a Network Interface.
 
-Warning!  This template provisions a large number of resources.  At a minimum, with the current defaults, 14 virtual machines and 3 storage accounts are provisioned.
-
 Below are the parameters that the template expects
 
 | Name   | Description    |
@@ -34,7 +32,3 @@ Below are the parameters that the template expects
 
 ##Notes
 Security Warning!  The configuration allows you to enabled external load balanced endpoints on a public IP.  The endpoint is not secure and it's recommended that you keep these endpoints internal or secure them. Elasticsearch Sheild product should be considered.
-
-One of the primary advantages to this approach is that you can distribute data nodes across multiple storage accounts.  Changing the virtual machine size for data nodes will affect the amount of storage for each node as it changes the number of data disks that are attached.
-
-The multiple data node templates with varying number of data disks is a temporary workaround until the features are available allowing us to attach a configurable number of data disks.

elasticsearch/azuredeploy-parameters.json

@@ -6,7 +6,7 @@
         "value":""
     },
     "adminUsername": {
-        "value": "trent"
+        "value": ""
     },
     "adminPassword": {
         "value": ""

elasticsearch/azuredeploy.json

@@ -174,9 +174,9 @@
     "jumpboxTemplateUrl": "[concat(variables('templateBaseUrl'), variables(concat('jumpboxTemplate',parameters('jumpbox'))))]",
     "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
     "ubuntuScripts": [
-      "[concat(variables('templateBaseUrl'), 'elasticsearch-azure-install.sh')]",
+      "[concat(variables('templateBaseUrl'), 'elasticsearch-ubuntu-install.sh')]",
       "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/shared_scripts/ubuntu/vm-disk-utils-0.1.sh"
-      ],
+    ],
     "ubuntuVMImage": "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_2_LTS-amd64-server-20150309-en-us-30GB",
     "ubuntuOSProfileConfigKey": "linuxConfiguration",
     "ubuntuOSProfileConfig": {
@@ -195,32 +195,6 @@
     }
   },
   "resources": [
-    {
-      "name": "shared",
-      "type": "Microsoft.Resources/deployments",
-      "apiVersion": "2015-01-01",
-      "properties": {
-        "mode": "Incremental",
-        "templateLink": {
-          "uri": "[variables('sharedTemplateUrl')]",
-          "contentVersion": "1.0.0.0"
-        },
-        "parameters": {
-          "region": {
-            "value": "[parameters('region')]"
-          },
-          "networkSettings": {
-            "value": "[variables('networkSettings')]"
-          },
-          "esDataHaSetName": {
-            "value": "[variables('dataNodeAvailabilitySetName')]"
-          },
-          "storageAccountName": {
-            "value": "[concat(parameters('storageAccountPrefix'),'shared')]"
-          }
-        }
-      }
-    },
     {
       "name": "master-nodes",
       "type": "Microsoft.Resources/deployments",
@@ -265,6 +239,41 @@
         }
       }
     },
+    {
+      "name": "shared",
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2015-01-01",
+      "properties": {
+        "mode": "Incremental",
+        "templateLink": {
+          "uri": "[variables('sharedTemplateUrl')]",
+          "contentVersion": "1.0.0.0"
+        },
+        "parameters": {
+          "region": {
+            "value": "[parameters('region')]"
+          },
+          "networkSettings": {
+            "value": "[variables('networkSettings')]"
+          },
+          "esDataHaSetName": {
+            "value": "[variables('dataNodeAvailabilitySetName')]"
+          },
+          "storageAccountName": {
+            "value": "[concat(parameters('storageAccountPrefix'),'shared')]"
+          },
+          "loadBalancerType": {
+            "value": "[parameters('loadBalancerType')]"
+          },
+          "ilbIpAddress": {
+            "value": "10.0.0.100"
+          },
+          "dnsName": {
+            "value": "[parameters('dnsNameforLBIP')]"
+          }
+        }
+      }
+    },
     {
       "name": "client-nodes",
       "type": "Microsoft.Resources/deployments",