From 4a1ecb6eeb93bf71e7a0e6f5984373a6cbf21220 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Wed, 28 Nov 2018 17:44:26 -0500
Subject: [PATCH] ADDTOTAB Script - Add some smarts and file system info

---
 pillar/data/addtotab.sh | 60 ++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 197afb47c..9fc3e3e9c 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -8,31 +8,41 @@ IPADDRESS=$3
 CPUS=$4
 GUID=$5
 MANINT=$6
-MONINT=$7
+ROOTFS=$7
+NSM=$8
+MONINT=$9
 
+echo "Seeing if this host is already in here. If so delete it"
+if grep -q $NAME "/opt/so/saltstack/pillar/data/$TYPE.sls"; then
+  echo "Node Already Present - Let's re-add it"
+  awk -v blah="  $NAME:" 'BEGIN{ print_flag=1 }
+{
+    if( $0 ~ blah )
+    {
+       print_flag=0;
+       next
+    }
+    if( $0 ~ /^  [a-zA-Z0-9]+:$/ )
+    {
+        print_flag=1;
+    }
+    if ( print_flag == 1 )
+        print $0
 
-if grep -q $IPADDRESS "/opt/so/saltstack/pillar/data/$1.sls"; then
-  echo "Node Already Present"
-else
-  echo "  $NAME:" >> /opt/so/saltstack/pillar/data/$1.sls
-  echo "    ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls
-  echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
-  echo "    totalcpus: $CPUS" >> /opt/so/saltstack/pillar/data/$1.sls
-  echo "    guid: $GUID" >> /opt/so/saltstack/pillar/data/$1.sls
-  if [ $TYPE == 'sensorstab' ]; then
-    echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
-    salt-call state.apply ca
-    salt-call state.apply ssl
-    salt-call state.apply common
-    salt-call state.apply utility
-  fi
-  if [ $TYPE == 'evaltab' ]; then
-    echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
-  fi
-  if [ $TYPE == 'nodestab' ]; then
-    salt-call state.apply ca
-    salt-call state.apply ssl
-    salt-call state.apply common
-    salt-call state.apply utility
-  fi
+} ' /opt/so/saltstack/pillar/data/$TYPE.sls > /opt/so/saltstack/pillar/data/tmp.$TYPE.sls
+mv /opt/so/saltstack/pillar/data/tmp.$TYPE.sls /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "Deleted $NAME from the tab. Now adding it in again with updated info"
+fi
+echo "  $NAME:" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    totalcpus: $CPUS" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    guid: $GUID" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    rootfs: $ROOTFS" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+echo "    nsm: $NSM" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+if [ $TYPE == 'sensorstab' ]; then
+  echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$TYPE.sls
+fi
+if [ $TYPE == 'evaltab' ]; then
+  echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$TYPE.sls
 fi