commit 5a7f7fd645f3a8244e1d4fe93960b7508afbb878
author Filip Pytloun <filip@pytloun.cz> Mon Feb 27 18:50:25 2017 +0100
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Mon Feb 27 17:52:06 2017 +0000
tree ca50d95f643577bb65aef80a3d261f10c7d0c3a8
parent f06ca0f512dc3b3b97a46a3817e49c080ee384f5

Always use compound match for salt minions

Change-Id: Ief6ae8463181eaadb3e4d29c8ae98d829abd2c09

src/com/mirantis/mk/Salt.groovy

diff --git a/src/com/mirantis/mk/Salt.groovy b/src/com/mirantis/mk/Salt.groovy
index 021a3e5..ef37198 100644
--- a/src/com/mirantis/mk/Salt.groovy
+++ b/src/com/mirantis/mk/Salt.groovy
@@ -83,7 +83,7 @@
 }
 
 def pillarGet(master, target, pillar) {
-    def out = runSaltCommand(master, 'local', target, 'pillar.get', null, [pillar.replace('.', ':')])
+    def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'pillar.get', null, [pillar.replace('.', ':')])
     return out
 }
 
@@ -95,7 +95,7 @@
         run_states = state.join(',')
     }
 
-    def out = runSaltCommand(master, 'local', target, 'state.sls', null, [run_states])
+    def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'state.sls', null, [run_states])
     try {
         checkResult(out)
     } finally {
@@ -107,16 +107,16 @@
 }
 
 def cmdRun(master, target, cmd) {
-    def out = runSaltCommand(master, 'local', target, 'cmd.run', null, [cmd])
+    def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'cmd.run', null, [cmd])
     return out
 }
 
 def syncAll(master, target) {
-    return runSaltCommand(master, 'local', target, 'saltutil.sync_all')
+    return runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'saltutil.sync_all')
 }
 
 def enforceHighstate(master, target, output = false) {
-    def out = runSaltCommand(master, 'local', target, 'state.highstate')
+    def out = runSaltCommand(master, 'local', ['expression': target, 'type': 'compound'], 'state.highstate')
     try {
         checkResult(out)
     } finally {