Invalid ip address fix #193
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
… behavior when obtaining the ssh IP address This commit adds an option that forces get_ssh_ip to filter the vm.guest.net entries for a network adapter that ‘exists’ on the VM, as vsphere does not always return the correct primary ipAddress if new interfaces have been defined at provision time or later. We encountered the situation at NSIDC when provisioning VMs which were running docker/docker-compose and had docker-defined internal interfaces that vsphere picked up and assumed were the primary IP. This will not address situations where users have defined a VM with multiple ‘legitimate’ interfaces, and throws an error if that situation is encountered.
| @app.call env | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def filter_guest_nic(vm, machine) | ||
| return vm.guest.ipAddress unless machine.provider_config.real_nic_ip | ||
| adapters = vm.guest.net.select { |g| g.deviceConfigId > 0 }.map { |g| g.ipAddress[0] } |
There was a problem hiding this comment.
It looks like the map call here will end up giving us an array of IP addresses, not adapter objects. If I'm reading this correctly, adapters should be renamed to ips or something.
There was a problem hiding this comment.
Excellent point. Will update accordingly.
- Bump version should be a minor rev, not a patch - updated/tagged accordingly - Updated variable name from adapter to ip_addresses for clarity - Move error text into localization yaml
| @@ -1,3 +1,8 @@ | |||
| ## [1.9.0 (2016-05-17)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.8.2) | |||
ghost
merged commit
This pull request was closed.
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.
Fix in response to #192
Adds an configurable option to allow the plugin to filter the machine network interfaces for one with an actual adapter and return that IP instead of the vsphere primary ip address.