summaryrefslogtreecommitdiffstats
path: root/doctor_tests
diff options
context:
space:
mode:
authorwenjuan dong <dong.wenjuan@zte.com.cn>2018-08-09 06:07:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-09 06:07:37 +0000
commiteaeb3c0f9dc9e6645a159d0a78b9fc181fce53d4 (patch)
treeea500412d8f6cad6b8d30519451df3e3e07c9a27 /doctor_tests
parentdcbe7bf1c26052b0e95d209254e7273aa1eaace1 (diff)
parent9bc09d1d18d4777438515393a9427fc0733e6f09 (diff)
Merge "add ssh_keyfile for connect to installer in Apex"
Diffstat (limited to 'doctor_tests')
-rw-r--r--doctor_tests/installer/__init__.py4
-rw-r--r--doctor_tests/installer/apex.py1
-rw-r--r--doctor_tests/installer/mcp.py3
3 files changed, 7 insertions, 1 deletions
diff --git a/doctor_tests/installer/__init__.py b/doctor_tests/installer/__init__.py
index 31fce75..ee44018 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 1ce3eb6..c851b2a 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 8ba9f00..e7e41db 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()