Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass all data to batch.run() call when using --failhard #33048

Merged
merged 1 commit into from
May 5, 2016
Merged

Pass all data to batch.run() call when using --failhard #33048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions salt/cli/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ def run(self):
active.remove(minion)
if self.opts.get('raw'):
yield data
elif self.opts.get('failhard'):
# When failhard is passed, we need to return all data to include
# the retcode to use in salt/cli/salt.py later. See issue #24996.
ret[minion] = data
yield {minion: data}
else:
ret[minion] = data['ret']
yield {minion: data['ret']}
Expand Down