commit 8c33e7f156c442781accedcb8ad73288633bac09
author Filip Pytloun <fpytloun@mirantis.com> Tue Jun 20 08:43:01 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jun 20 08:43:03 2017 +0000
tree f3f52d21f13a369621c64f5192a07680645de1d3
parent 1a0ae1f147dd275daa1575423cfe23a678927154
parent f6dea9712507f9163b9a161a16efe15d32b2023c

Merge "Set single-node as default discovery type"

docker/swarm/stack/elasticsearch.yml

diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
index 1a2cd51..ae63d5c 100644
--- a/docker/swarm/stack/elasticsearch.yml
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -5,6 +5,7 @@
     elasticsearch_cluster_name: oss-cluster
     elasticsearch_xpack_security_enabled: 'false'
     elasticsearch_discovery_zen_minimum_master_nodes: 1
+    elasticsearch_discovery_type: single-node
   docker:
     client:
       stack:
@@ -13,7 +14,7 @@
             cluster.name: ${_param:elasticsearch_cluster_name}
             xpack.security.enabled: ${_param:elasticsearch_xpack_security_enabled}
             discovery.zen.minimum_master_nodes: ${_param:elasticsearch_discovery_zen_minimum_master_nodes}
-            ES_JAVA_OPTS: '-Des.enforce.bootstrap.checks=true'
+            discovery.type: ${_param:elasticsearch_discovery_type}
           service:
             cluster:
               image: ${_param:docker_image_oss_elasticsearch}