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

Made state-level failhard override global failhard. #46448

Merged
merged 6 commits into from Apr 4, 2018

Conversation

@github-abcde
Copy link
Contributor

@github-abcde github-abcde commented Mar 8, 2018

Also update documentation for failhard and onfail-requisites.
(I hope I got the refs right)

What does this PR do?

It allows a global failhard setting to be overriden by a state-level failhard setting.

What issues does this PR fix or reference?

#20496

Previous Behavior

Whenever global failhard is True, even setting failhard to False in the state still causes the state run to be aborted.

New Behavior

A state-level failhard setting of False overrides (for that state only) a global failhard.

Tests written?

No

Commits signed with GPG?

Yes

@ghost ghost self-requested a review Mar 8, 2018
@thatch45
Copy link
Member

@thatch45 thatch45 commented Mar 12, 2018

Just make sure that this is never backported into a point release because this is a behavior change :)

@rallytime
Copy link
Contributor

@rallytime rallytime commented Mar 12, 2018

@github-abcde Can you add a mention of this to the Fluorine release notes, please?

@github-abcde
Copy link
Contributor Author

@github-abcde github-abcde commented Mar 13, 2018

@rallytime This is new to me. Does this mean I have to add an entry to `docs/topics/releases/fluorine.rst'? (And would that be including the mention not to backport it?)

@rallytime
Copy link
Contributor

@rallytime rallytime commented Mar 13, 2018

@github-abcde Yeah, sorry for being unclear there. We need to make sure that behavior changes of this kind are documented in the release notes. In this case, that means the Fluorine.rst file. You don't need to worry about mentioning not to back-port this in the release notes.

@rallytime
Copy link
Contributor

@rallytime rallytime commented Mar 15, 2018

@garethgreenaway Can you review this again, now that some doc updates have been added?

@rallytime rallytime requested a review from garethgreenaway Mar 26, 2018
@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 3, 2018

@github-abcde Ah, there looks to be a merge conflict in the release notes. Can you rebase this and fix the conflicts? Thanks!

@github-abcde
Copy link
Contributor Author

@github-abcde github-abcde commented Apr 4, 2018

@rallytime Done

@rallytime rallytime requested a review from cachedout Apr 4, 2018
@rallytime rallytime merged commit 2a84c95 into saltstack:develop Apr 4, 2018
6 of 10 checks passed
@github-abcde github-abcde deleted the allow_failhard_override branch Apr 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants