Remove Curator

salt/manager/tools/sbin/so-elastic-auth-password-reset

@@ -97,8 +97,6 @@ function soUserSync() {
   salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch or G@role:so-searchnode or G@role:so-heavynode' state.apply logstash queue=True
   printf "\nApplying kibana state to the appropriate nodes.\n\n"
   salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch' state.apply kibana queue=True
-  printf "\nApplying curator state to the appropriate nodes.\n\n"
-  salt -C 'G@role:so-standalone or G@role:so-eval or G@role:so-import or G@role:so-manager or G@role:so-managersearch or G@role:so-searchnode or G@role:so-heavynode' state.apply curator queue=True
 }
 
 function highstateManager() {

salt/manager/tools/sbin/so-minion

@@ -302,13 +302,6 @@ function add_strelka_to_minion() {
 	"  " >> $PILLARFILE
 }
 
-function add_curator_to_minion() {
-    printf '%s\n'\
-    "curator:"\
-    "  enabled: True"\
-	"  " >> $PILLARFILE
-}
-
 function add_telegraf_to_minion() {
     printf '%s\n'\
     "telegraf:"\
@@ -435,7 +428,6 @@ function createEVAL() {
 	add_playbook_to_minion
 	add_elastalert_to_minion
 	add_kibana_to_minion
-	add_curator_to_minion
 	add_telegraf_to_minion
 	add_influxdb_to_minion
 	add_nginx_to_minion
@@ -458,7 +450,6 @@ function createSTANDALONE() {
 	add_elastalert_to_minion
 	add_kibana_to_minion
 	add_redis_to_minion
-	add_curator_to_minion
 	add_telegraf_to_minion
 	add_influxdb_to_minion
 	add_nginx_to_minion
@@ -478,7 +469,6 @@ function createMANAGER() {
 	add_elastalert_to_minion
 	add_kibana_to_minion
 	add_redis_to_minion
-	add_curator_to_minion
 	add_telegraf_to_minion
 	add_influxdb_to_minion
 	add_nginx_to_minion
@@ -498,7 +488,6 @@ function createMANAGERSEARCH() {
 	add_elastalert_to_minion
 	add_kibana_to_minion
 	add_redis_to_minion
-	add_curator_to_minion
 	add_telegraf_to_minion
 	add_influxdb_to_minion
 	add_nginx_to_minion
@@ -548,7 +537,6 @@ function createHEAVYNODE() {
 	add_sensor_to_minion
 	add_strelka_to_minion
 	add_redis_to_minion
-	add_curator_to_minion
 	add_telegraf_to_minion
 }
 
@@ -679,4 +667,4 @@ case "$OPERATION" in
 	*)
 		usage
 		;;
-esac
+esac

salt/manager/tools/sbin/soup

@@ -465,9 +465,8 @@ post_to_2.4.30() {
 }
 
 post_to_2.4.40() {
-  echo "Removing Curator close and delete files"
-  rm -f /opt/so/conf/curator/action/*-close.y*ml
-  rm -f /opt/so/conf/curator/action/logs*-delete.y*ml
+  echo "Removing Curator configuration"
+  rm -rf /opt/so/conf/curator/
 }
 
 repo_sync() {