Don't ignore 'private_ips' unnecessarily #46243
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
- Looks like this was originally introduced to resolve an issue with HP servers putting public_ips in the private_ip list. - The code has been refactored several times since then. - This affects the code where 'ssh_interface: private_ips' so we by definition do not want to use public_ips anyway. - The original code prevents servers with only private_ips (e.g on some rackconnect_v3 servers) from building as salt-cloud thinks the private_ips are not valid. - ISSUE saltstack#46215
ghost
self-requested a review
gtmanfred
approved these changes
Feb 28, 2018
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?
Removes a test for the existence of a private_ip in an earlier list of private_ips where salt-cloud has been told to use private_ips for ssh access.
What issues does this PR fix or reference?
#46215 salt-cloud will only intermittently build rackspace cloud instances with purely private networks
Previous Behavior
salt-cloud ignores valid private_ip addresses assigned by the API
New Behavior
If ssh_interface is 'private_ips' then check whether IP is in ignore_cidr range, but don't ignore the IP if it was found in the original list of private_ips which was gathered when the new instance was created.
Tests written?
No
Commits signed with GPG?
No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.