cloud.clouds.ec2: cache each named node #33164
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
|
LGTM |
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
May 16, 2016
* upstream/develop: (60 commits) allow top cfg to be YAML for consistency and flexibility (current syntax does not allow blank lines or comments) (saltstack#33189) allow user to revert vm to the specific snapshot for vmware (saltstack#33234) Support for Advanced Policy Firewall (APF) (saltstack#33134) Fix list_values, add test (saltstack#33264) Gentoo/OpenRC service management enhancements (saltstack#33260) Don't send passwords after shim delimiter is found (saltstack#33170) Properly report on invalid gitfs/git_pillar/winrepo repos (saltstack#33244) Windows: salt fails to start when running in system account (saltstack#33220) add nodegroups ext_pillar (saltstack#33179) Fix boto_vpc_test to work with saltstack#32677 (saltstack#33214) Expose CherryPy option to write access and error logs (saltstack#33226) [2015.8] Merge forward from 2015.5 to 2015.8 (saltstack#33207) Don't try to kill a parent proc if we can't Add a fetch when compiling git_pillar for masterless minions (saltstack#33204) Resolve issue with pkg module on Mint Linux (saltstack#33205) cloud.clouds.ec2: cache each named node (saltstack#33164) Properly handle failed git commands when redirect_stderr=True (saltstack#33203) Add pip installed and removed test (saltstack#33178) Don't force use of global ssh_config when git identity file is specified (saltstack#33152) update 2015.8.9 release notes (saltstack#33198) ...
sergeizv
added a commit
to sergeizv/salt
that referenced
this pull request
Mar 2, 2017
This reverts commit b3805d8 ("cloud.clouds.ec2: cache each named node (saltstack#33164)"). Commit 25771fc ("_get_node return instance info directly, not a dict of instances") from 2016.3 feature release changed how the result of _get_node should be interpreted. Before it was like res = _get_node(...) node = res[name] and after the commit it became node = _get_node(...) Commit b3805d8 ("cloud.clouds.ec2: cache each named node (saltstack#33164)") submitted into 2015.8 as a bugfix for saltstack#33162 added loops over the keys of a dictionary returned by _get_node, fixing salt.utils.cloud.cache_node calls in queue_instances() and show_instance(). But after being merged into 2016.3 with merge commit 679200a ("Merge branch '2015.8' into '2016.3'"), the commit in question reintroduced the bug on 2016.3 because of changed return value of _get_node. Fixes saltstack#39782
Merged
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?
fix node caching for EC2, ping @techhat
What issues does this PR fix or reference?
#33162
Previous Behavior
stack trace (see issue)
New Behavior
Tests written?
No