Merge remote-tracking branch 'remotes/origin/dev' into issue/6811

This commit is contained in:
m0duspwnens
2022-01-11 10:02:18 -05:00

View File

@@ -24,7 +24,7 @@ include:
{% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%}
{% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
{% set MANAGERIP = salt['pillar.get']('global:managerip') %}
{% set ESMOUNT = salt ['pillar.get']('elasticsearch:extramount', False) %}
{% set ESMOUNT = salt['pillar.get']('elasticsearch:extramount', False) %}
{% if grains['role'] in ['so-eval','so-managersearch', 'so-manager', 'so-standalone', 'so-import'] %}
{% set esclustername = salt['pillar.get']('manager:esclustername') %}