Skip to content

Made state-level failhard override global failhard.#46448

Merged
rallytime merged 6 commits into
saltstack:developfrom
basisbeeld:allow_failhard_override
Apr 4, 2018
Merged

Made state-level failhard override global failhard.#46448
rallytime merged 6 commits into
saltstack:developfrom
basisbeeld:allow_failhard_override

Conversation

@github-abcde
Copy link
Copy Markdown
Contributor

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 March 8, 2018 15:47
@thatch45
Copy link
Copy Markdown
Contributor

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

@rallytime
Copy link
Copy Markdown
Contributor

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

@github-abcde
Copy link
Copy Markdown
Contributor Author

@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
Copy Markdown
Contributor

@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
Copy Markdown
Contributor

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

@rallytime
Copy link
Copy Markdown
Contributor

@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
Copy Markdown
Contributor Author

@rallytime Done

@rallytime rallytime requested a review from cachedout April 4, 2018 15:12
@rallytime rallytime merged commit 2a84c95 into saltstack:develop Apr 4, 2018
@github-abcde github-abcde deleted the allow_failhard_override branch April 6, 2018 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants