commit fb9996df0c806db7928328e1c159cc674d70bf58
author Jakub Josef <jakub.josef@gmail.com> Tue Apr 10 14:05:31 2018 +0200
committer Jakub Josef <jakub.josef@gmail.com> Tue Apr 10 14:05:31 2018 +0200
tree b67063d7cdb96cb3d603f086c99fca400945536f
parent efc9acf4e404c6b4e3492b0c8f06705b0015fa9f

Fixed waitForMinion functionality in Salt.groovy

Change-Id: I46c2fccb262ab9698a0fc822cd339db414a164e8

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index b71bf2f..5973184 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -796,7 +796,8 @@
                                 resKey = k
                             }
                             resource = node[resKey]
-                            if(resKey.contains("salt_minion_service_restart") && resource instanceof Map && resource.keySet().contains("result")){
+                            // try to find if salt_minion service was restarted
+                            if(resKey instanceof String && resKey.contains("salt_minion_service_restart") && resource instanceof Map && resource.keySet().contains("result")){
                                 if((resource["result"] instanceof Boolean && resource["result"]) || (resource["result"] instanceof String && resource["result"] == "true")){
                                     if(resource.changes.size() > 0){
                                         isMinionRestarted=true