diff options
| author |   wenjuan dong <dong.wenjuan@zte.com.cn> | 2018-10-25 06:05:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-25 06:05:48 +0000 |
| commit | 23bf63c4616040cb0d69cd26238af2a4a7c00a90 (patch) | |
| tree | f4f10c0afdf8ba69d6ea640e5cbf779a3ac49409 /doctor_tests/installer | |
| parent | 61eb3927ada784cc3dffb5ddd17f66e47871f708 (diff) | |
| parent | 2a1d82ade82c3076a630af41da493da5a606993d (diff) | |
Merge "fix the username to login undercloud in Apex"
Diffstat (limited to 'doctor_tests/installer')
| -rw-r--r-- | doctor_tests/installer/__init__.py | 4 | ||||
| -rw-r--r-- | doctor_tests/installer/apex.py | 3 | ||||
| -rw-r--r-- | doctor_tests/installer/daisy.py | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/doctor_tests/installer/__init__.py b/doctor_tests/installer/__init__.py index ee44018c..2b9ad83d 100644 --- a/doctor_tests/installer/__init__.py +++ b/doctor_tests/installer/__init__.py @@ -20,10 +20,6 @@ OPTS = [ cfg.StrOpt('ip', default=os.environ.get('INSTALLER_IP', '127.0.0.1'), help='the ip of installer'), - cfg.StrOpt('username', - 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', diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py index 694adb88..31850a74 100644 --- a/doctor_tests/installer/apex.py +++ b/doctor_tests/installer/apex.py @@ -16,6 +16,7 @@ from doctor_tests.installer.base import BaseInstaller class ApexInstaller(BaseInstaller): node_user_name = 'heat-admin' + installer_username = 'stack' cm_set_script = 'set_config.py' nc_set_compute_script = 'set_compute_config.py' cg_set_script = 'set_congress.py' @@ -26,7 +27,7 @@ class ApexInstaller(BaseInstaller): def __init__(self, conf, log): super(ApexInstaller, self).__init__(conf, log) self.client = SSHClient(self.conf.installer.ip, - self.conf.installer.username, + self.installer_username, key_filename=self.conf.installer.key_file, look_for_keys=True) self.key_file = None diff --git a/doctor_tests/installer/daisy.py b/doctor_tests/installer/daisy.py index 52ccb7c8..e4499d9c 100644 --- a/doctor_tests/installer/daisy.py +++ b/doctor_tests/installer/daisy.py @@ -12,11 +12,12 @@ from doctor_tests.installer.base import BaseInstaller class DaisyInstaller(BaseInstaller): node_user_name = 'root' + installer_username = 'root' def __init__(self, conf, log): super(DaisyInstaller, self).__init__(conf, log) self.client = SSHClient(self.conf.installer.ip, - self.conf.installer.username, + self.installer_username, password='r00tme') self.key_file = None self.controllers = list() |