Update Curator scripts

salt/curator/init.sls

@@ -5,12 +5,6 @@
 
 {% from 'allowed_states.map.jinja' import allowed_states %}
 {% if sls in allowed_states %}
-{% from 'vars/globals.map.jinja' import GLOBALS %}
-{% from 'docker/docker.map.jinja' import DOCKER %}
-{% from "curator/map.jinja" import CURATOROPTIONS %}
-{% from "curator/map.jinja" import CURATORMERGED %}
-{% set REMOVECURATORCRON = False %}
-
 # Curator
 # Create the group
 curatorgroup:
@@ -27,6 +21,17 @@ curator:
     - createhome: False
 
 # Create the log directory
+curlogdir:
+  file.directory:
+    - name: /opt/so/log/curator
+    - user: 934
+    - group: 939
+{% from 'vars/globals.map.jinja' import GLOBALS %}
+{% if GLOBALS.role in ['so-eval', 'so-standalone', 'so-managersearch', 'so-heavynode', 'so-manager']%}
+{% from 'docker/docker.map.jinja' import DOCKER %}
+{% from "curator/map.jinja" import CURATOROPTIONS %}
+{% from "curator/map.jinja" import CURATORMERGED %}
+{% set REMOVECURATORCRON = False %}
 curactiondir:
   file.directory:
     - name: /opt/so/conf/curator/action
@@ -34,12 +39,6 @@ curactiondir:
     - group: 939
     - makedirs: True
 
-curlogdir:
-  file.directory:
-    - name: /opt/so/log/curator
-    - user: 934
-    - group: 939
-
 actionconfs:
   file.recurse:
     - name: /opt/so/conf/curator/action
@@ -172,7 +171,34 @@ so-curatorclusterdelete:
     - daymonth: '*'
     - month: '*'
     - dayweek: '*'
+{% else %}
+curnodedel:
+  file.managed:
+    - name: /usr/sbin/so-curator-node-delete
+    - source: salt://curator/files/bin/so-curator-node-delete
+    - user: 934
+    - group: 939
+    - mode: 755
 
+curnodedeldel:
+  file.managed:
+    - name: /usr/sbin/so-curator-node-delete-delete
+    - source: salt://curator/files/bin/so-curator-node-delete-delete
+    - user: 934
+    - group: 939
+    - mode: 755
+    - template: jinja
+
+so-curatornodedeletecron:
+  cron.present:
+    - name: /usr/sbin/so-curator-node-delete > /opt/so/log/curator/cron-node-delete.log 2>&1
+    - user: root
+    - minute: '*/5'
+    - hour: '*'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+{% endif %}
 {% else %}
 
 {{sls}}_state_not_allowed: