diff options
| author |   wenjuan dong <dong.wenjuan@zte.com.cn> | 2018-08-09 06:07:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-09 06:07:37 +0000 |
| commit | eaeb3c0f9dc9e6645a159d0a78b9fc181fce53d4 (patch) | |
| tree | ea500412d8f6cad6b8d30519451df3e3e07c9a27 | |
| parent | dcbe7bf1c26052b0e95d209254e7273aa1eaace1 (diff) | |
| parent | 9bc09d1d18d4777438515393a9427fc0733e6f09 (diff) | |
Merge "add ssh_keyfile for connect to installer in Apex"
| -rw-r--r-- | doctor_tests/installer/__init__.py | 4 | ||||
| -rw-r--r-- | doctor_tests/installer/apex.py | 1 | ||||
| -rw-r--r-- | doctor_tests/installer/mcp.py | 3 | ||||
| -rw-r--r-- | tox.ini | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/doctor_tests/installer/__init__.py b/doctor_tests/installer/__init__.py index 31fce754..ee44018c 100644 --- a/doctor_tests/installer/__init__.py +++ b/doctor_tests/installer/__init__.py @@ -24,6 +24,10 @@ OPTS = [ default='root', help='the user name for login installer server', required=True), + cfg.StrOpt('key_file', + default=os.environ.get('SSH_KEY', None), + help='the key for user to login installer server', + required=False), ] diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py index 1ce3eb65..c851b2ac 100644 --- a/doctor_tests/installer/apex.py +++ b/doctor_tests/installer/apex.py @@ -19,6 +19,7 @@ class ApexInstaller(BaseInstaller): super(ApexInstaller, self).__init__(conf, log) self.client = SSHClient(self.conf.installer.ip, self.conf.installer.username, + key_filename=self.conf.installer.key_file, look_for_keys=True) self.key_file = None self.controllers = list() diff --git a/doctor_tests/installer/mcp.py b/doctor_tests/installer/mcp.py index 8ba9f000..e7e41dbe 100644 --- a/doctor_tests/installer/mcp.py +++ b/doctor_tests/installer/mcp.py @@ -22,7 +22,8 @@ class McpInstaller(BaseInstaller): self.key_file = self.get_ssh_key_from_installer() self.client = SSHClient(self.conf.installer.ip, self.node_user_name, - key_filename=self.key_file) + key_filename=self.key_file, + look_for_keys=True) self.controllers = list() self.controller_clients = list() @@ -30,6 +30,7 @@ passenv = INSTALLER_IP INSPECTOR_TYPE TEST_CASE + SSH_KEY changedir = {toxinidir}/doctor_tests commands = doctor-test |