From 3461c7e22608090ecb301adb4ca94eef248c855b Mon Sep 17 00:00:00 2001
From: Wes Lambert <wlambertts@gmail.com>
Date: Wed, 5 Dec 2018 15:14:36 +0000
Subject: [PATCH] Curator - Update config for Eval Mode

---
 salt/curator/files/action/close.yml                    |  8 +++++++-
 salt/curator/files/action/delete.yml                   |  8 +++++++-
 salt/curator/files/bin/so-curator-closed-delete-delete | 10 +++++++++-
 salt/curator/files/curator.yml                         |  8 +++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/salt/curator/files/action/close.yml b/salt/curator/files/action/close.yml
index 70d7fa119..ab4d07050 100644
--- a/salt/curator/files/action/close.yml
+++ b/salt/curator/files/action/close.yml
@@ -1,5 +1,11 @@
-{% if grains['role'] == 'so-node' or grains['role'] == 'so-eval' %}
+{% if grains['role'] == 'so-node' %}
+
 {%- set cur_close_days = salt['pillar.get']('node:cur_close_days', '') -%}
+
+{% elif grains['role'] == 'so-eval' %}
+
+{%- set cur_close_days = salt['pillar.get']('master:cur_close_days', '') -%}
+
 {%- endif %}
 
 ---
diff --git a/salt/curator/files/action/delete.yml b/salt/curator/files/action/delete.yml
index 07c19a2ca..1b3440f8b 100644
--- a/salt/curator/files/action/delete.yml
+++ b/salt/curator/files/action/delete.yml
@@ -1,5 +1,11 @@
-{% if grains['role'] == 'so-node' or grains['role'] == 'so-eval' %}
+{% if grains['role'] == 'so-node' %}
+
 {%- set log_size_limit = salt['pillar.get']('node:log_size_limit', '') -%}
+
+{% elif grains['role'] == 'so-eval' %}
+
+{%- set log_size_limit = salt['pillar.get']('master:log_size_limit', '') -%}
+
 {%- endif %}
 ---
 # Remember, leave a key empty if there is no value.  None will be a string,
diff --git a/salt/curator/files/bin/so-curator-closed-delete-delete b/salt/curator/files/bin/so-curator-closed-delete-delete
index 4b4c5344c..8841c843f 100755
--- a/salt/curator/files/bin/so-curator-closed-delete-delete
+++ b/salt/curator/files/bin/so-curator-closed-delete-delete
@@ -1,8 +1,16 @@
 
-{% if grains['role'] == 'so-node' or grains['role'] == 'so-eval' %}
+{% if grains['role'] == 'so-node' %}
+
 {%- set ELASTICSEARCH_HOST = salt['pillar.get']('node:mainip', '') -%}
 {%- set ELASTICSEARCH_PORT = salt['pillar.get']('node:es_port', '') -%}
 {%- set LOG_SIZE_LIMIT = salt['pillar.get']('node:log_size_limit', '') -%}
+
+{% elif grains['role'] == 'so-eval' %}
+
+{%- set ELASTICSEARCH_HOST = salt['pillar.get']('master:mainip', '') -%}
+{%- set ELASTICSEARCH_PORT = salt['pillar.get']('master:es_port', '') -%}
+{%- set LOG_SIZE_LIMIT = salt['pillar.get']('master:log_size_limit', '') -%}
+
 {%- endif %}
 
 #!/bin/bash
diff --git a/salt/curator/files/curator.yml b/salt/curator/files/curator.yml
index e115bcd54..aa55836b1 100644
--- a/salt/curator/files/curator.yml
+++ b/salt/curator/files/curator.yml
@@ -1,5 +1,11 @@
-{% if grains['role'] == 'so-node' or grains['role'] == 'so-eval' %}
+{% if grains['role'] == 'so-node' %}
+
 {%- set elasticsearch = salt['pillar.get']('node:mainip', '') -%}
+
+{% elif grains['role'] == 'so-eval' %}
+
+{%- set elasticsearch = salt['pillar.get']('master:mainip', '') -%}
+
 {%- endif %}
 
 ---