From 085a8e861710180bc6245472d4bf90352ea4c1ab Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Fri, 18 May 2018 14:16:43 -0400
Subject: [PATCH] Setup Script - Add New node types

---
 salt/top.sls        |  2 +-
 so-setup-network.sh | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/salt/top.sls b/salt/top.sls
index a4cfc201c..e92020084 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -23,7 +23,7 @@ base:
     - logstash
 
   'G@role:so-node':
-    {%- if nodetype == 'parsing' %}
+    {%- if nodetype == 'parser' %}
     - common
     - logstash
     {% elsif nodetype == 'hot' %}
diff --git a/so-setup-network.sh b/so-setup-network.sh
index 5ad2be2dd..bc84c877a 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -340,6 +340,7 @@ node_pillar() {
   echo "  ls_input_threads: $LSINPUTTHREADS" >> $TMP/$HOSTNAME.sls
   echo "  ls_batch_count: $LSINPUTBATCHCOUNT" >> $TMP/$HOSTNAME.sls
   echo "  es_shard_count: $SHARDCOUNT" >> $TMP/$HOSTNAME.sls
+  echo "  node_type: $NODETYPE" >> $TMP/$HOSTNAME.sls
 
 }
 
@@ -441,7 +442,23 @@ sensor_pillar() {
 
 }
 
-update_sudoers() {
+set_node_type() {
+
+  # Determine the node type based on whiplash choice
+  if [ $INSTALLTYPE == 'STORAGENODE' ]; then
+    $NODETYPE=storage
+  fi
+  if [ $INSTALLTYPE == 'PARSINGNODE' ]; then
+    $NODETYPE=parser
+  fi
+  if [ $INSTALLTYPE == 'HOTNODE' ]; then
+    $NODETYPE=hot
+  fi
+  if [ $INSTALLTYPE == 'WARMNODE' ]; then
+    $NODETYPE=warm
+  fi
+
+}update_sudoers() {
 
   # Update Sudoers so that socore can accept keys without a password
   echo "socore ALL=(ALL) NOPASSWD:/usr/bin/salt-key" | sudo tee -a /etc/sudoers
@@ -866,7 +883,7 @@ if (whiptail_you_sure) then
     salt_checkin
   fi
 
-  if [ $INSTALLTYPE == 'STORAGENODE' ]; then
+  else
     whiptail_management_nic
     echo "Why isn't this working"
     whiptail_management_server
@@ -889,6 +906,7 @@ if (whiptail_you_sure) then
     copy_ssh_key
     saltify
     configure_minion node
+    set_node_type
     node_pillar
     copy_minion_pillar nodes
     salt_checkin