Skip to content
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.

Sign up for GitHub

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

Jump to bottom

orchestra: Respect username if set in ssh config #2000

Merged
merged 1 commit into from
Aug 20, 2024
Merged

orchestra: Respect username if set in ssh config #2000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion teuthology/orchestra/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,16 @@ def connect(user_at_host, host_key=None, keep_alive=False, timeout=60,
key_filename = key_filename or config.ssh_key
ssh_config_path = config.ssh_config_path or "~/.ssh/config"
ssh_config_path = os.path.expanduser(ssh_config_path)
if not key_filename and os.path.exists(ssh_config_path):
if os.path.exists(ssh_config_path):
ssh_config = paramiko.SSHConfig()
ssh_config.parse(open(ssh_config_path))
opts = ssh_config.lookup(host)
if not key_filename and 'identityfile' in opts:
key_filename = opts['identityfile']
if 'hostname' in opts:
connect_args['hostname'] = opts['hostname']
if 'user' in opts:
connect_args['username'] = opts['user']

if key_filename:
if not isinstance(key_filename, list):
Expand Down