commit 0df401e66ae58f581e4fd6df511a6fea58453eba
author Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Wed Jan 30 13:42:48 2019 +0100
committer Mateusz Matuszkowiak <mmatuszkowiak@mirantis.com> Tue May 21 10:07:24 2019 +0000
tree 7a8bda30913c8cfdab8d44d62fe13113774564ca
parent 9efa6b473c97280a9408e62e4662f19e8ab34cc9

Set properly the cluster name for Elasticsearch cluster instance

By default we should avoid the generic `elasticsearch` cluster name
for ES working in cluster mode. Instead, we should set it to name
as the cluster name is.

Change-Id: Ic00501e6dc68dee281f19e233661f2f9935a77ec
Closes-Bug: PROD-24049
(cherry picked from commit 92a3e6991bd1b41621f89a47e15db8b669b33522)

elasticsearch/server/cluster.yml

diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index 76774aa..155cfdf 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -5,7 +5,7 @@
   _param:
     java_environment_version: "8"
     java_environment_platform: openjdk
-    elasticsearch_cluster_name: elasticsearch
+    elasticsearch_cluster_name: ${_param:cluster_name}
   linux:
     system:
       sysctl:
@@ -17,7 +17,6 @@
   elasticsearch:
     server:
       version: ${_param:elasticsearch_version}
-      name: ${_param:elasticsearch_cluster_name}
       enabled: true
       master: true
       data: true
@@ -35,6 +34,7 @@
         recover_after_nodes: 2
         recover_after_time: 5m
       cluster:
+        name: ${_param:elasticsearch_cluster_name}
         multicast: false
         minimum_master_nodes: 2
         members: