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.

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

Resolve a couple bugs in orchestration output #35290

Merged
merged 7 commits into from
Aug 9, 2016

Conversation

terminalmage
Copy link
Contributor

This pull request suppresses printing of the ret event for runners executed from within orchestration, preventing the output from being displayed twice.

Additionally, for orchestration runner/wheel jobs, when the return data is not a dictionary, an error shows in the Changes section of the return data. This pull request also modifies the highstate outputter to look for a __orchestration__ key in the return data, and if it is present and set to True, the data in the changes value will simply be displayed using the nested outputter, bypassing the error message in the displayed output.

Resolves #35051.

@cachedout
Copy link
Contributor

Some test failures and some lint fixes here please.

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Aug 9, 2016
This allows the printing of namespaced events to be suppressed, for
instance in cases where we are running orchestration and don't want the
return data from a runner/wheel function to be printed to the console.
This gets passed through to the highstate outputter to suppress the
error in the output when the changes param is not a dict.
@terminalmage
Copy link
Contributor Author

OK, just pushed fixes, tests should be green when they complete.

@cachedout cachedout merged commit 2efc1b3 into saltstack:2015.8 Aug 9, 2016
@terminalmage terminalmage deleted the issue35051 branch November 30, 2016 03:24
@max-arnold
Copy link
Contributor

max-arnold commented Mar 23, 2021

This pull request also modifies the highstate outputter to look for a __orchestration__ key in the return data

I do not see the __orchestration__ key being accessed in the highstate outputter. Is it used at all? Is it safe to remove it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants