commit 15361048798bdfbb6250366afd820a15f2433a11
author Volodymyr Stoiko <vstoiko@mirantis.com> Mon Jun 12 16:03:51 2017 +0300
committer Volodymyr Stoiko <vstoiko@mirantis.com> Fri Jun 16 11:19:30 2017 +0000
tree 58b01852129942655ff9b8c50927dcbf36a9a156
parent 0c2b843fd08b3655a5ef348ae3b216410a7ffa35

Switch to upstream elasticsearch

Change-Id: I01feb4e31b36503282a66ae8bc9699c8e44b24b9

docker/swarm/stack/elasticsearch.yml

diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
index 083388c..1a2cd51 100644
--- a/docker/swarm/stack/elasticsearch.yml
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -1,11 +1,19 @@
 parameters:
   _param:
     elasticsearch_replicas: 1
-    docker_image_oss_elasticsearch: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/elasticsearch:latest
+    docker_image_elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+    elasticsearch_cluster_name: oss-cluster
+    elasticsearch_xpack_security_enabled: 'false'
+    elasticsearch_discovery_zen_minimum_master_nodes: 1
   docker:
     client:
       stack:
         elasticsearch:
+          environment:
+            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'
           service:
             cluster:
               image: ${_param:docker_image_oss_elasticsearch}
@@ -16,4 +24,4 @@
               ports:
                 - ${_param:haproxy_elasticsearch_exposed_port}:${_param:haproxy_elasticsearch_bind_port}
               volumes:
-                - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
+                - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
\ No newline at end of file