From 689df66267b995264324f1a09b5532ee5b623ef5 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Mon, 26 Nov 2018 19:53:04 -0500
Subject: [PATCH] Setup Script - Fix race condition with the common module

---
 pillar/data/addtotab.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 6352cbaec..ca6ccd639 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -21,12 +21,14 @@ else
   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 common
+    salt-call state.apply utility
   fi
   if [ $TYPE == 'evaltab' ]; then
     echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
   fi
-
-  salt-call state.apply common
-  salt-call state.apply utility
-
+  if [ $TYPE == 'nodestab' ]; then
+    salt-call state.apply common
+    salt-call state.apply utility
+  fi
 fi