Fix plugin script to find the right version

Reboot the client after installing the new salt version

diff --git a/100-update-salt.sh.in b/100-update-salt.sh.in
index d5575d0d5e31ad7d555e81c9a62499325a99dff7..da9d34261fe95371640af09e1f676554ce7acd0a 100644 (file)
--- a/100-update-salt.sh.in
+++ b/100-update-salt.sh.in
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Package to update the salt-minion on the clients.
+# Script to update the salt-minion on the clients.
 
 MINION=$1
 
-SALTV=$( salt $MINION grains.get saltversion | tail -n1 )
-
+SALTV=$( salt $MINION grains.get saltversion | tail -n1 | tr -d ' ' )
+echo "$MINION $SALTV"
 if [ "${SALTV}" -a "$SALTV" != "VERSION" ]; then
        salt $MINION state.apply SaltMinion
        salt-key -yd $MINION

diff --git a/init.sls.in b/init.sls.in
index 7ad73831367971019bd0586b9b0513fa0db43840..bc1e621585c61af200b7f37c5b3349c0ab44119b 100644 (file)
--- a/init.sls.in
+++ b/init.sls.in
@@ -27,6 +27,6 @@ SaltMinion:
       install_flags: '/S /master=admin /minion-name={{ name }}'
       locale: de_DE
       msiexec: False
-      reboot: False
+      reboot: True
       cache_dir: False