[2017.7] Merge forward from 2016.11 to 2017.7 #43371
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
- Drop preserve_minions as a a condition used in the check_minion_cache() logic test. This should be more in line with the intent of the "Optionally, pass in a list of minions which should have their caches preserved. To preserve all caches, set __opts__['preserve_minion_cache']" comment documented in key.py. - Add --preserve_minions as an optional CLI option to salt-key. This will allow the user to optionally preserve caches independently of the preserve_minion_cache option. Option does not override config file. - This effectively reverts commit 661f568 which introduced the regression with preserve_minion_cache set to True to fix a regression when preserve_minion_cache is set to False. Prior to that commit, the preserve_minion_cache option was completely ignored when set to True and when set to False cache directories were still preserved. - Functional testing (three minions 'minion1', 'oldminion', and 'minion2') /etc/salt/master - preserve_minion_cache: False # salt-key -d minion1 PASS: deletes 'minion1', deletes stale 'oldminion', preserve active 'minion2' # salt-key -d minion1 --preserve-minions=true PASS: preserves minion1 as requested, deletes oldminion as it was not in the match from the delete_key() comment "To preserve the master caches of minions who are matched", preserves active minion2 /etc/salt/master - preserve_minion_cache: True # salt-key -d minion1 PASS: no directories deleted per config option # salt-key -d minion1 --preserve-minions=false PASS: no directories deleted per config option, does not override config
Back-port various mention bot settings to 2016.11
ipaddr_start ipaddr_end for el7
As of Fedora 26, dnf interprets arguments after "repository-packages" as arguments to the repository-package subcommand, which breaks pkg.list_repo_pkgs on that Fedora release. Moving this argument earlier in the command allows pkg.list_repo_pkgs to work.
It looks like the configparser in Python 3 does not insert the `__name__` key in each section. Popping it without a default causes a KeyError on Python 3. This commit fixes that KeyError.
…ifications Update release branch section with a few more details
Fix failing tests in Fedora
…serve-minion-cache-2016.11 Fix 'preserve_minion_cache: True' functionality (fixes saltstack#35840)
Back-port saltstack#43329 to 2016.11
Conflicts: - salt/key.py - salt/modules/yumpkg.py
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.
Conflicts: