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

[2018.3] minion_blackout for scheduled jobs #50586

Merged

Conversation

Projects
None yet
3 participants
@garethgreenaway
Copy link
Member

commented Nov 20, 2018

What does this PR do?

Adding support for minion_blackout for jobs that are run from the Salt scheduler.

What issues does this PR fix or reference?

#50562

Tests written?

Yes

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway garethgreenaway requested a review from terminalmage Nov 20, 2018

@rares-pop
Copy link
Contributor

left a comment

LGTM

garethgreenaway added some commits Nov 20, 2018

Moving the minion_blackout code to the start of the try...except. Add…
…ing a test to ensure we get a log.exception when minion_blackout is True.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:50562_minion_blackout_scheduler branch from 5ce79a6 to 9f422b2 Nov 21, 2018

Adding some defaults for minion_blackout code when pillar & grains ar…
…e not available in opts. Removing some debugging code.

@garethgreenaway garethgreenaway changed the title [WIP][2018.3] minion_blackout for scheduled jobs [2018.3] minion_blackout for scheduled jobs Nov 21, 2018

@cachedout cachedout merged commit 59809a1 into saltstack:2018.3 Nov 23, 2018

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.