From 9485cb5fba44624a6dc9e496589dbcf82943a74e Mon Sep 17 00:00:00 2001
From: Dominic Werner <Dominic.Werner@dolby.com>
Date: Wed, 12 Apr 2017 16:54:49 +0200
Subject: [PATCH] add option to set minimum masters add option to set initial
 node scale

---
 templates/es-cluster/0/docker-compose.yml  |  2 +-
 templates/es-cluster/0/rancher-compose.yml | 26 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/templates/es-cluster/0/docker-compose.yml b/templates/es-cluster/0/docker-compose.yml
index d239c2e..cf2d3d3 100644
--- a/templates/es-cluster/0/docker-compose.yml
+++ b/templates/es-cluster/0/docker-compose.yml
@@ -10,7 +10,7 @@ services:
             - "bootstrap.memory_lock=true"
             - "xpack.security.enabled=false"
             - "ES_JAVA_OPTS=-Xms${heap_size} -Xmx${heap_size}"
-            - "discovery.zen.minimum_master_nodes=2"
+            - "discovery.zen.minimum_master_nodes=${minimum_master_nodes}"
             - "node.master=true"
         ulimits: 
             memlock:
diff --git a/templates/es-cluster/0/rancher-compose.yml b/templates/es-cluster/0/rancher-compose.yml
index bb04d7b..d42d891 100644
--- a/templates/es-cluster/0/rancher-compose.yml
+++ b/templates/es-cluster/0/rancher-compose.yml
@@ -7,34 +7,48 @@
         - variable: "cluster_name"
           type: "string"
           required: true
-          label: "Cluster Name"
+          label: "Cluster name"
           description: "Name of the Elasticsearch Cluster"
           default: "es-cluster"
         
         - variable: "heap_size"
           type: "string"
           required: true
-          label: "Heap Size"
+          label: "Heap size"
           description: "Heap size to be allocated for Java"
           default: "512m"
         
         - variable: "mem_limit"
           type: "int"
           required: true
-          label: "Memory Limit in Byte"
+          label: "Memory limit in byte"
           description: "Memory limit in Byte per elasticsearch container. AT LEAST double the heap size!"
           default: 1073741824
         
         - variable: "kibana_port"
           type: "int"
           required: true
-          label: "Public Kibana Port"
+          label: "Public kibana port"
           description: "Public port where kibana will be accessible"
           default: 5601
 
+        - variable: "minimum_master_nodes"
+          type: "int"
+          required: true
+          label: "# of minimum Master Nodes"
+          description: "Set the number of required master nodes to reach quorum. Sets initial scale to this value as well"
+          default: 2
+
+        - variable: "initial_data_nodes"
+          type: "int"
+          required: true
+          label: "# of initial nodes"
+          description: "Set the initial number of nodes"
+          default: 1
+
 
 es-master:
-  scale: 2
+  scale: ${minimum_master_nodes}
 
 es-node:
-  scale: 1
\ No newline at end of file
+  scale: ${initial_data_nodes}
\ No newline at end of file