Merge pull request #34822 from thatch45/ssh_fixes

Fix salt-ssh state.high and state.low
saltstack · Jul 21, 2016 · acc9e31 · acc9e31
2 parents 5d91139 + b5de492
commit acc9e31
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/salt/client/ssh/wrapper/state.py b/salt/client/ssh/wrapper/state.py
@@ -153,7 +153,9 @@ def low(data, **kwargs):
             __pillar__,
             __salt__,
             __context__['fileclient'])
-    err = st_.verify_data(data)
+    for chunk in chunks:
+        chunk['__id__'] = chunk['name'] if not chunk.get('__id__') else chunk['__id__']
+    err = st_.state.verify_data(data)
     if err:
         return err
     file_refs = salt.client.ssh.state.lowstate_file_refs(
@@ -221,7 +223,7 @@ def high(data, **kwargs):
             __pillar__,
             __salt__,
             __context__['fileclient'])
-    chunks = st_.state.compile_high_data(high)
+    chunks = st_.state.compile_high_data(data)
     file_refs = salt.client.ssh.state.lowstate_file_refs(
             chunks,
             _merge_extra_filerefs(