Add support for 5.6.3 (elastic#148)

* Use [resourceGroup().location] as the default value for location parameter * Add support for 5.6.3 and remove 5.6.2
SkyKick · Oct 13, 2017 · e238207 · e238207
1 parent 8c5bb10
commit e238207
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/build/allowedValues.json b/build/allowedValues.json
@@ -48,8 +48,8 @@
     "5.5.3": {
       "kibana": "5.5.3"
     },
-    "5.6.2": {
-      "kibana": "5.6.2"
+    "5.6.3": {
+      "kibana": "5.6.3"
     }
   },
   "numberOfDataNodes" : 50,

diff --git a/src/createUiDefinition.json b/src/createUiDefinition.json
@@ -54,7 +54,7 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v5.6.2",
+            "defaultValue": "v5.6.3",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
@@ -123,8 +123,8 @@
                   "value": "5.5.3"
                 },
                 {
-                  "label": "v5.6.2",
-                  "value": "5.6.2"
+                  "label": "v5.6.3",
+                  "value": "5.6.3"
                 }
               ]
             }

diff --git a/src/mainTemplate.json b/src/mainTemplate.json
@@ -20,7 +20,7 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "5.6.2",
+      "defaultValue": "5.6.3",
       "allowedValues": [
         "2.0.2",
         "2.1.2",
@@ -38,7 +38,7 @@
         "5.5.1",
         "5.5.2",
         "5.5.3",
-        "5.6.2"
+        "5.6.3"
       ],
       "metadata": {
         "description": "Elasticsearch version to install"
@@ -535,9 +535,9 @@
     },
     "location": {
       "type": "string",
-      "defaultValue": "ResourceGroup",
+      "defaultValue": "[resourceGroup().location]",
       "metadata": {
-        "description": "Location where resources will be provisioned. A value of 'ResourceGroup' will deploy the resources to the same location as the resource group, any other value must be a valid Azure location e.g. 'australiasoutheast'"
+        "description": "Location where resources will be provisioned. By default, the template deploys the resources to the same location as the resource group. If specified, must be a valid Azure location e.g. 'australiasoutheast'"
       }
     },
     "vNetNewOrExisting": {
@@ -753,7 +753,7 @@
     },
     "loadBalancerTemplateUrl": "[concat(variables('templateBaseUrl'), 'loadbalancers/', variables('loadBalancerOptions')[parameters('loadBalancerType')],'.json')]",
     "osSettingsTemplateUrl": "[concat(variables('templateBaseUrl'), 'settings/ubuntuSettings.json')]",
-    "location": "[if(equals('resourcegroup', toLower(parameters('location'))), resourceGroup().location, parameters('location'))]",
+    "location": "[parameters('location')]",
     "azureCloudStorageAccount": {
       "name": "[parameters('azureCloudStorageAccountName')]",
       "key": "[parameters('azureCloudStorageAccountKey')]",
@@ -776,7 +776,7 @@
       "5.5.1": "5.5.1",
       "5.5.2": "5.5.2",
       "5.5.3": "5.5.3",
-      "5.6.2": "5.6.2"
+      "5.6.3": "5.6.3"
     },
     "esSettings": {
       "clusterName": "[parameters('esClusterName')]",