commit 1ab31f3770b910044db5e05d87c40af658580924
author Vnaumov <vnaumov@mirantis.com> Mon Oct 09 14:53:39 2017 +0300
committer Vnaumov <vnaumov@mirantis.com> Thu Oct 12 12:09:40 2017 +0300
tree 8f2ab6381c79b0c73b764c44d780aa3acc348e97
parent b4604f3adc551e59397021f8d13c42429247bffe

possibility of switching to generic ES-cluster if exist

when SL service defined, default OSS-ElasticSearch cluster turned off
and switched to SL Elasticsearch to avoid duplicating
related us: https://mirantis.jira.com/browse/PROD-14954

Change-Id: I32f2d982179a0f661f23edaaf672f035a16f0160

elasticsearch/client/init.yml

diff --git a/elasticsearch/client/init.yml b/elasticsearch/client/init.yml
index d0710ca..061cd6e 100644
--- a/elasticsearch/client/init.yml
+++ b/elasticsearch/client/init.yml
@@ -7,4 +7,4 @@
       enabled: true
       server:
         host: ${_param:elasticsearch_client_host}
-        port: ${_param:elasticsearch_client_port}
\ No newline at end of file
+        port: ${_param:elasticsearch_client_port}

elasticsearch/client/single.yml

diff --git a/elasticsearch/client/single.yml b/elasticsearch/client/single.yml
index d9ce432..c4e2b43 100644
--- a/elasticsearch/client/single.yml
+++ b/elasticsearch/client/single.yml
@@ -6,3 +6,4 @@
       enabled: true
       server:
         host: ${_param:stacklight_log_address}
+        port: ${_param:haproxy_elasticsearch_http_bind_port}

elasticsearch/server/cluster.yml

diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 8f53f21..9be44ed 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -5,6 +5,7 @@
   _param:
     java_environment_version: "8"
     java_environment_platform: openjdk
+    elasticsearch_cluster_name: elasticsearch
   linux:
     system:
       sysctl:
@@ -15,6 +16,7 @@
       headless: true
   elasticsearch:
     server:
+      name: ${_param:elasticsearch_cluster_name}
       enabled: true
       master: true
       data: true