commit 374beb726c48dcc75d056f644b9544c741c51003
author Jakub Josef <jakub.josef@gmail.com> Thu Apr 27 15:45:09 2017 +0200
committer Jakub Josef <jakub.josef@gmail.com> Thu Apr 27 15:45:09 2017 +0200
tree 86e2dbac79b2b5eafe505117bbeff6c1eddffb94
parent 4df782741a11ff13fa6a76a4e14301ad7df850e4

Added error printing in salt exception

Change-Id: I2d2625dafd099afb57d8de5c866f05817114fa0b

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 60ccc26..6cbc226 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -138,7 +138,7 @@
 
     def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'state.sls', batch, [run_states])
 
-    checkResult(out, failOnError, output, !output)
+    checkResult(out, failOnError, output)
     return out
 }
 
@@ -179,7 +179,7 @@
  */
 def enforceHighstate(master, target, output = false, failOnError = true, batch = null) {
     def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'state.highstate', batch)
-    checkResult(out, failOnError, output, !output)
+    checkResult(out, failOnError, output)
     return out
 }
 
@@ -264,10 +264,9 @@
  * @param result    Parsed response of Salt API
  * @param failOnError Do you want to throw exception if salt-call fails (optional, default true)
  * @param printResults Do you want to print salt results (optional, default true)
- * @param printStateOnError Do you want to print failed state on error (optional, default true)
  * @param printOnlyChanges If true (default), print only changed resources
  */
-def checkResult(result, failOnError = true, printResults = true, printStateOnError = true, printOnlyChanges = true) {
+def checkResult(result, failOnError = true, printResults = true, printOnlyChanges = true) {
     def common = new com.mirantis.mk.Common()
     if(result != null){
         if(result['return']){
@@ -303,12 +302,7 @@
                                        input message: "False result on ${nodeKey} found, resource ${prettyResource}. \nDo you want to continue?"
                                     }
                                 }else{
-                                    def errorMsg
-                                    if(printStateOnError){
-                                        errorMsg = "Salt state on node ${nodeKey} failed: ${resource}. State output: ${node}"
-                                    }else{
-                                        errorMsg = "Salt state on node ${nodeKey} failed. Look on error upper."
-                                    }
+                                    def errorMsg = "Salt state on node ${nodeKey} failed: ${resource}. State output: ${node}"
                                     if (failOnError) {
                                         throw new Exception(errorMsg)
                                     } else {