Conversion Host - Try hostname for SSH and fix MiqSshUtil args #18103
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
agrare
reviewed
Oct 17, 2018
app/models/conversion_host.rb
Outdated
| @@ -34,6 +34,7 @@ def source_transport_method | |||
| end | |||
|
|
|||
| def ipaddress(family = 'ipv4') | |||
| return resource.hostname if resource.hostname | |||
There was a problem hiding this comment.
Hm I wouldn't expect an ipaddress method to return a dns hostname, maybe another method that tries hostname then ipaddress?
There was a problem hiding this comment.
I've added a delegation for hostname and updated miq_ssh_util_args to use it if present.
agrare
reviewed
Oct 17, 2018
| @@ -121,7 +122,7 @@ def check_resource_credentials_openstack | |||
|
|
|||
| def connect_ssh | |||
| require 'MiqSshUtil' | |||
| MiqSshUtil.shell_with_su(miq_ssh_util_args) do |ssu, _shell| | |||
| MiqSshUtil.shell_with_su(*miq_ssh_util_args) do |ssu, _shell| | |||
|
Checked commits fabiendupont/manageiq@c1c93cd~...1de3f2d with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0 |
ghost
changed the title
ghost
deleted the
simaishi
pushed a commit
that referenced
this pull request
Oct 18, 2018
…e_as_ipaddress Conversion Host - Try hostname for SSH and fix MiqSshUtil args (cherry picked from commit 84a80a0) https://bugzilla.redhat.com/show_bug.cgi?id=1634029
|
Hammer backport details: |
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.
The IP addresses of a virtual machine or a host are not ordered accordingly to their interface name or role. So, when trying to connect to a conversion host, the IP address might not be correct. Returning the hostname when it's available mimics the behavior of Host.connect_ssh method.
This PR also fixes the parameters for
MiqSshUtil.shell_with_suby passing the array correctly.Associated RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1634029