Skip to content

fix(minion): correct master_failback config option name#590

Merged
dafyddj merged 1 commit into
saltstack-formulas:masterfrom
propertyguru:fix-master-failback-typo
Jun 27, 2026
Merged

fix(minion): correct master_failback config option name#590
dafyddj merged 1 commit into
saltstack-formulas:masterfrom
propertyguru:fix-master-failback-typo

Conversation

@pault-pg

Copy link
Copy Markdown
Contributor

salt/files/minion.d/f_defaults.conf renders master_fallback /
master_fallback_interval, but Salt's options are master_failback /
master_failback_interval. Easy typo to miss — the embedded word should be
fail, not fall:

master_fallback   <- template renders this (not a Salt option)
master_failback   <- Salt's actual option
         ^

With no generic passthrough (only keys with an explicit get_config call are
rendered), setting master_failback in pillar is silently dropped today; the
correct spelling already appears in this file's comments.

Verify against Salt's source (VALID_OPTS / DEFAULT_MINION_OPTS):
https://github.com/saltstack/salt/blob/v3008.1/salt/config/__init__.py#L151-L154
https://github.com/saltstack/salt/blob/v3008.1/salt/config/__init__.py#L1132-L1133

Typo present since 2017 (edce95f).

Co-authored-by: Claude noreply@anthropic.com

@pault-pg

Copy link
Copy Markdown
Contributor Author

Heads up on the failing checks here — they're not from this change. The kitchen suites fail on a pre-existing breakage: salt installs "latest" over the image's pinned salt, and the in-place onedir swap crashes the post-install module refresh. After PR #591 is merged, rebasing this PR should make the checks pass.

`salt/files/minion.d/f_defaults.conf` renders `master_fallback` /
`master_fallback_interval`, but Salt's options are `master_failback` /
`master_failback_interval`. Easy typo to miss — the embedded word should be
`fail`, not `fall`:

    master_fallback   <- template renders this (not a Salt option)
    master_failback   <- Salt's actual option
             ^

With no generic passthrough (only keys with an explicit `get_config` call are
rendered), setting `master_failback` in pillar is silently dropped today; the
correct spelling already appears in this file's comments.

Verify against Salt's source (VALID_OPTS / DEFAULT_MINION_OPTS):
https://github.com/saltstack/salt/blob/v3008.1/salt/config/__init__.py#L151-L154
https://github.com/saltstack/salt/blob/v3008.1/salt/config/__init__.py#L1132-L1133

Typo present since 2017 (edce95f).

Co-authored-by: Claude <noreply@anthropic.com>
@pault-pg pault-pg force-pushed the fix-master-failback-typo branch from 31c149c to 231aa55 Compare June 27, 2026 02:01

@dafyddj dafyddj left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing this typo, although I would like to point out that there is a generic passthrough implemented here, so I don't believe this issue was a show-stopper.

@dafyddj dafyddj merged commit 5458145 into saltstack-formulas:master Jun 27, 2026
26 checks passed
@saltstack-formulas-github

Copy link
Copy Markdown

🎉 This PR is included in version 1.13.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@pault-pg pault-pg deleted the fix-master-failback-typo branch July 2, 2026 02:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants