From c2c5de12544ba604b82606499f91ec3c8a15f3e9 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Fri, 13 Mar 2020 17:07:29 +0100 Subject: [PATCH] Stop using system SSH config files by default. Change-Id: I530aefeae98fabc2f73fe625f384bd5b6592178b --- tobiko/shell/ssh/config.py | 3 +-- tobiko/tests/unit/shell/test_ssh.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tobiko/shell/ssh/config.py b/tobiko/shell/ssh/config.py index 1c08d13f1..cb887a655 100644 --- a/tobiko/shell/ssh/config.py +++ b/tobiko/shell/ssh/config.py @@ -34,8 +34,7 @@ OPTIONS = [ default=None, help=('Default SSH username')), cfg.ListOpt('config_files', - default=['/etc/ssh/ssh_config', '~/.ssh/config', - './ssh_config'], + default=['ssh_config'], help="Default user SSH configuration files"), cfg.StrOpt('key_file', default='~/.ssh/id_rsa', diff --git a/tobiko/tests/unit/shell/test_ssh.py b/tobiko/tests/unit/shell/test_ssh.py index 52440d75c..511ef3b33 100644 --- a/tobiko/tests/unit/shell/test_ssh.py +++ b/tobiko/tests/unit/shell/test_ssh.py @@ -58,6 +58,7 @@ class SSHClientFixtureTest(unit.TobikoUnitTest): ssh_config = paramiko.SSHConfig() 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): with open(ssh_config_file) as f: ssh_config.parse(f)