x/tobiko
Code Issues Proposed changes

Stop using system SSH config files by default.

Browse Source 
Change-Id: I530aefeae98fabc2f73fe625f384bd5b6592178b
This commit is contained in:
Federico Ressi 2020-03-13 17:07:29 +01:00
parent 3fef57a712
commit c2c5de1254
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tobiko/shell/ssh/config.py
View File

@ -34,8 +34,7 @@ OPTIONS = [
default=None, default=None,
help=('Default SSH username')), help=('Default SSH username')),
cfg.ListOpt('config_files', cfg.ListOpt('config_files',
default=['/etc/ssh/ssh_config', '~/.ssh/config', default=['ssh_config'],
'./ssh_config'],
help="Default user SSH configuration files"), help="Default user SSH configuration files"),
cfg.StrOpt('key_file', cfg.StrOpt('key_file',
default='~/.ssh/id_rsa', default='~/.ssh/id_rsa',

1
tobiko/tests/unit/shell/test_ssh.py
View File

@ -58,6 +58,7 @@ class SSHClientFixtureTest(unit.TobikoUnitTest):
ssh_config = paramiko.SSHConfig() ssh_config = paramiko.SSHConfig()
for ssh_config_file in CONF.tobiko.ssh.config_files: for ssh_config_file in CONF.tobiko.ssh.config_files:
ssh_config_file = tobiko.tobiko_config_path(ssh_config_file)
if os.path.exists(ssh_config_file): if os.path.exists(ssh_config_file):
with open(ssh_config_file) as f: with open(ssh_config_file) as f:
ssh_config.parse(f) ssh_config.parse(f)