Fix determining whether to use local_batch
Change-Id: I73ad1bd44240efcf28f389e8b949326d3ff7f8fd
diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 6d4f8e8..4ceee99 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -48,7 +48,7 @@
* @param target Target specification, eg. for compound matches by Pillar
* data: ['expression': 'I@openssh:server', 'type': 'compound'])
* @param function Function to execute (eg. "state.sls")
- * @param batch
+ * @param batch
* @param args Additional arguments to function
* @param kwargs Additional key-value arguments to function
*/
@@ -63,8 +63,8 @@
'expr_form': target.type,
]
- if (batch) {
- data['batch'] = batch
+ if (batch == true) {
+ data['batch'] = "local_batch"
}
if (args) {
@@ -158,7 +158,7 @@
common.infoMsg("Running step ${fun} on ${tgt}")
- if (batch) {
+ if (batch == true) {
out = runSaltCommand(master, 'local_batch', ['expression': tgt, 'type': 'compound'], fun, String.valueOf(batch), arg)
} else {
out = runSaltCommand(master, 'local', ['expression': tgt, 'type': 'compound'], fun, batch, arg)