From 3e322c38eb4559e8f3ccf34f321e47175c4d00ad Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 2 Dec 2020 15:33:35 -0500 Subject: [PATCH] Fix config for single cluster mode --- salt/elasticsearch/files/elasticsearch.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/salt/elasticsearch/files/elasticsearch.yml b/salt/elasticsearch/files/elasticsearch.yml index a7a6ad34a..b4ea86d5a 100644 --- a/salt/elasticsearch/files/elasticsearch.yml +++ b/salt/elasticsearch/files/elasticsearch.yml @@ -1,8 +1,12 @@ {%- set NODE_ROUTE_TYPE = salt['pillar.get']('elasticsearch:node_route_type', 'hot') %} -{%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:esclustername', '') %} -{%- set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') %} +{%- set NODEIP = salt['pillar.get']('elasticsearch:mainip') %} {%- set FEATURES = salt['pillar.get']('elastic:features', False) %} {%- set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} +{%- if TRUECLUSTER is sameas true %} + {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:true_cluster_name') %} +{%- else %} + {%- set ESCLUSTERNAME = salt['pillar.get']('elasticsearch:esclustername') %} +{%- endif %} cluster.name: "{{ ESCLUSTERNAME }}" network.host: 0.0.0.0 @@ -45,12 +49,16 @@ script.max_compilations_rate: 1000/1m {%- if grains.role == 'so-manager' %} {%- if salt['pillar.get']('nodestab', {}) %} node.roles: [ master, remote_cluster_client ] - {%- endif %} - {%- else %} -node.roles: [ data, ingest, ml ] - {%- endif %} discovery.seed_hosts: - {{ grains.master }} cluster.initial_master_nodes: - {{ grains.master }} + {%- endif %} + {%- else %} +node.roles: [ data, ingest, ml ] +discovery.seed_hosts: + - {{ grains.master }} +cluster.initial_master_nodes: + - {{ grains.master }} + {%- endif %} {%- endif %}