Merge pull request #34822 from thatch45/ssh_fixes

Fix salt-ssh state.high and state.low
This commit is contained in:
Mike Place 2016-07-21 13:16:19 -06:00 committed by GitHub
commit acc9e31c02

View File

@ -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(