Always make changes to minion config if set (2015.8) #34020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
twangboy
changed the title
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 19, 2016
* upstream/develop: (67 commits) Change 'Suse' to 'SUSE' in inspect_collector_test Add a test to check for disconnected minion messaging Fixes doc refresh bug on chrome mobile. Fixed a bug in the consul.py module that was preventing services (saltstack#34051) Back-port saltstack#34026 to 2016.3 (saltstack#34050) Ensure only one fileserver update in a masterless run Updated latest release version Always make changes to minion config if set (saltstack#34020) More YAML indentation fixes in state module examples (saltstack#34030) Warn when custom returners don't have minions kwarg in save_load Add note to release notes about returner minions kwarg change Fix loop over cache in auth checking! Save an entire minion cache traversal on each master pub Do not cache remote files if they are already cached Warn when custom returners don't have minions kwarg in save_load Add note to release notes about returner minions kwarg change Fix loop over cache in auth checking! Save an entire minion cache traversal on each master pub states.file: fix indentation in YAML examples (saltstack#34003) Lint fix for saltstack#34000 (saltstack#34005) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Always add master and minion id settings to minion config.
What issues does this PR fix or reference?
#33783
Previous Behavior
Only added master and minion ID if the minion config was the default config.
New Behavior
Always sets the minion config.
Tests written?
NA