-
-
Notifications
You must be signed in to change notification settings - Fork 29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
(BKR-1423) Fix SSH settings in nodesets #28
Conversation
Allow SSH settings from nodesets to propagate properly into the host's SSH configuration. BKR-1423 #close
@sbeaulie This is the correct fix instead of the PR in voxpupuli/beaker#1633 |
@sbeaulie The issue is that if the |
I've traced the code and the only place it seems to be used is with the rsynch method in beaker so I don't see where it would conflict - can you shed light on where it would replace everything? I can test my suggestion with the |
The We almost need a |
Testing a solution now. |
This is the code where it is being used: https://github.com/puppetlabs/beaker/blob/master/lib/beaker/host.rb#L550-L552 We could change the name in both places. But I still don't see where NET::SSH would pick the I tested with having both
as you can see the config is there, and it succesfully merged the port from the configuration file. |
Can I ask you to test with my suggested change and give me the details on the failure you get? Thanks! |
It will work, because it's ignoring everything else. See the This basically seems like it's fixing the original issue, but it's not because all of the other options in the hash are now ignored. |
If you try sticking something that Net::SSH can't handle into the Hash, you can see it fail. |
Ensure that rsync connections use the on-disk Vagrant SSH configuraiton if an alternate physical SSH configuration has not been specified. Correlates directly with voxpupuli/beaker-vagrant#28
Ok, this commit, when combined with voxpupuli/beaker#1634 should do the right thing in all cases (I think) |
ok I'm following now 😄 From the Net SSH config class documents:
In beaker we run start like so Net::SSH.start(host, user, ssh_opts) where
If we look at the source code for Net:SSH version 5.0 used in beaker you are correct that the ssh_opts hash will return an ArgumentError for any non valid options: The only thing in the start method that is different from the experience you describe is that it seems like it would load the file from In conclusion, I'm happy with this fix, One thing left to fix is the Unit tests. See the travis results: https://travis-ci.com/github/puppetlabs/beaker-vagrant/jobs/299555431 |
Allow SSH settings from nodesets to propagate properly into the host's
SSH configuration.
BKR-1423 #close