From 5ad6bd73072714917120d0d596fa226afd7fd1fd Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Wed, 20 Jul 2016 12:05:12 -0600 Subject: [PATCH 1/2] fix #34796 --- salt/client/ssh/wrapper/state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/client/ssh/wrapper/state.py b/salt/client/ssh/wrapper/state.py index 0dce3cb580fa..b9c1a43b4412 100644 --- a/salt/client/ssh/wrapper/state.py +++ b/salt/client/ssh/wrapper/state.py @@ -221,7 +221,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( From b5de492143a7f142e01d6ecbe5a7a9502c2c41a2 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Wed, 20 Jul 2016 12:13:24 -0600 Subject: [PATCH 2/2] fix #34798 --- salt/client/ssh/wrapper/state.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/salt/client/ssh/wrapper/state.py b/salt/client/ssh/wrapper/state.py index b9c1a43b4412..75a490795666 100644 --- 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(