Allow SNs to resolve the ES master

This commit is contained in:
TOoSmOotH
2020-12-17 20:08:21 -05:00
parent 89a9816d50
commit 6448ddc31a

View File

@@ -23,6 +23,7 @@
{% set FEATURES = salt['pillar.get']('elastic:features', False) %} {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
{% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%} {% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%}
{% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %} {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
{% set MANAGERIP = salt['pillar.get']('global:managerip') %}
{% if FEATURES is sameas true %} {% if FEATURES is sameas true %}
{% set FEATUREZ = "-features" %} {% set FEATUREZ = "-features" %}
@@ -192,11 +193,16 @@ so-elasticsearch:
- name: so-elasticsearch - name: so-elasticsearch
- user: elasticsearch - user: elasticsearch
- extra_hosts: - extra_hosts:
- "{{ grains.host }}:{{ NODEIP }}" - extra_hosts:
{% if salt['pillar.get']('nodestab', {}) %} {% if ismanager %}
{% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %} - {{ grains.host }}:{{ NODEIP }}
- "{{ SN.split('_')|first }}:{{ SNDATA.ip }}" {% if salt['pillar.get']('nodestab', {}) %}
{% endfor %} {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
- {{ SN.split('_')|first }}:{{ SNDATA.ip }}
{% endfor %}
{% endif %}
{% else %}
- {{ MANAGER }}:{{ MANAGERIP }}
{% endif %} {% endif %}
- environment: - environment:
{% if TRUECLUSTER is sameas false or (TRUECLUSTER is sameas true and not salt['pillar.get']('nodestab', {})) %} {% if TRUECLUSTER is sameas false or (TRUECLUSTER is sameas true and not salt['pillar.get']('nodestab', {})) %}