commit 63366117e1aabfb9a01ca835b830cbf2ae797dac
author Marek Celoud <mceloud@mirantis.com> Tue Jul 25 17:27:24 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Tue Jul 25 17:27:24 2017 +0200
tree 0ec5073d9c140f142ad0a361ba8c7201b3a758c4
parent 29c9e33f8e79701d7cd5858ca0d40d869aa81088

unite info messages for salt actions

Change-Id: I746638150d3aa7a7e64241013c9240a40fd2e42b

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 36e199d..73072c7 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -143,7 +143,7 @@
         run_states = state.join(',')
     }
 
-    common.infoMsg("Enforcing state ${run_states} on ${target}")
+    common.infoMsg("Running state ${run_states} on ${target}")
     def out
 
     if (optional == false || testTarget(master, target)){
@@ -308,7 +308,7 @@
     def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'state.highstate', batch)
     def common = new com.mirantis.mk.Common()
 
-    common.infoMsg("Running step state.highstate on ${target}")
+    common.infoMsg("Running state highstate on ${target}")
 
     checkResult(out, failOnError, output)
     return out
@@ -389,7 +389,7 @@
     def salt = new com.mirantis.mk.Salt()
     def out
 
-    common.infoMsg("Running step ${fun} on ${tgt}")
+    common.infoMsg("Running step ${fun} ${arg} on ${tgt}")
 
     if (batch == true) {
         out = runSaltCommand(master, 'local_batch', ['expression': tgt, 'type': 'compound'], fun, String.valueOf(batch), arg, null, timeout)