summaryrefslogtreecommitdiffstats
path: root/doctor_tests/installer/apex.py
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2018-03-19 17:12:03 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2018-03-20 10:33:46 +0800
commit6bd4e026fca92b281382a3f6b46f7ab7eeb31f45 (patch)
tree6284dfdbcd651476d72895e8b09d5e420b9b2fa2 /doctor_tests/installer/apex.py
parent8dc884e35c1cbfb2181f2bf803e3dc0171cbdbe6 (diff)
support MCP installer
1.support MCP installer 2.optimize the installer code JIRA: DOCTOR-121 Change-Id: I8675c2652944575a8f73d0d1e2dafaad5a3e88e3 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'doctor_tests/installer/apex.py')
-rw-r--r--doctor_tests/installer/apex.py101
1 files changed, 22 insertions, 79 deletions
diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index e106f249..1ce3eb65 100644
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -6,14 +6,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import getpass
-import grp
-import os
-import pwd
-import stat
-import subprocess
-
-from doctor_tests.common.utils import get_doctor_test_root_dir
from doctor_tests.common.utils import SSHClient
from doctor_tests.installer.base import BaseInstaller
@@ -31,14 +23,12 @@ class ApexInstaller(BaseInstaller):
self.key_file = None
self.controllers = list()
self.controller_clients = list()
- self.servers = list()
- self.test_dir = get_doctor_test_root_dir()
def setup(self):
self.log.info('Setup Apex installer start......')
- self.get_ssh_key_from_installer()
- self.get_controller_ips()
+ self.key_file = self.get_ssh_key_from_installer()
+ self.controllers = self.get_controller_ips()
self.create_flavor()
self.set_apply_patches()
self.setup_stunnel()
@@ -49,21 +39,8 @@ class ApexInstaller(BaseInstaller):
server.terminate()
def get_ssh_key_from_installer(self):
- self.log.info('Get SSH keys from Apex installer......')
-
- if self.key_file is not None:
- self.log.info('Already have SSH keys from Apex installer......')
- return self.key_file
-
- ssh_key = '{0}/{1}'.format(self.test_dir, 'instack_key')
- self.client.scp('/home/stack/.ssh/id_rsa', ssh_key, method='get')
- user = getpass.getuser()
- uid = pwd.getpwnam(user).pw_uid
- gid = grp.getgrnam(user).gr_gid
- os.chown(ssh_key, uid, gid)
- os.chmod(ssh_key, stat.S_IREAD)
- self.key_file = ssh_key
- return self.key_file
+ key_path = '/home/stack/.ssh/id_rsa'
+ return self._get_ssh_key(self.client, key_path)
def get_controller_ips(self):
self.log.info('Get controller ips from Apex installer......')
@@ -71,75 +48,41 @@ class ApexInstaller(BaseInstaller):
command = "source stackrc; " \
"nova list | grep ' overcloud-controller-[0-9] ' " \
"| sed -e 's/^.*ctlplane=//' |awk '{print $1}'"
- ret, controllers = self.client.ssh(command)
- if ret:
- raise Exception('Exec command to get controller ips'
- 'in Apex installer failed, ret=%s, output=%s'
- % (ret, controllers))
+ controllers = self._run_cmd_remote(self.client, command)
self.log.info('Get controller_ips:%s from Apex installer'
% controllers)
- self.controllers = controllers
+ return controllers
def get_host_ip_from_hostname(self, hostname):
- self.log.info('Get host ip from host name in Apex installer......')
+ self.log.info('Get host ip by hostname=%s from Apex installer......'
+ % hostname)
hostname_in_undercloud = hostname.split('.')[0]
-
command = "source stackrc; nova show %s | awk '/ ctlplane network /{print $5}'" % (hostname_in_undercloud) # noqa
- ret, host_ip = self.client.ssh(command)
- if ret:
- raise Exception('Exec command to get host ip from hostname(%s)'
- 'in Apex installer failed, ret=%s, output=%s'
- % (hostname, ret, host_ip))
- self.log.info('Get host_ip:%s from host_name:%s in Apex installer'
- % (host_ip, hostname))
- return host_ip[0]
-
- def setup_stunnel(self):
- self.log.info('Setup ssh stunnel in controller nodes'
- 'in Apex installer......')
- for node_ip in self.controllers:
- cmd = ("ssh -o UserKnownHostsFile=/dev/null"
- " -o StrictHostKeyChecking=no"
- " -i %s %s@%s -R %s:localhost:%s"
- " sleep 600 > ssh_tunnel.%s.log"
- " 2>&1 < /dev/null &"
- % (self.key_file,
- self.node_user_name,
- node_ip,
- self.conf.consumer.port,
- self.conf.consumer.port,
- node_ip))
- server = subprocess.Popen(cmd, shell=True)
- self.servers.append(server)
- server.communicate()
+ host_ips = self._run_cmd_remote(self.client, command)
+ return host_ips[0]
def set_apply_patches(self):
self.log.info('Set apply patches start......')
+ restart_cm_cmd = 'sudo systemctl restart ' \
+ 'openstack-ceilometer-notification.service'
+
for node_ip in self.controllers:
client = SSHClient(node_ip, self.node_user_name,
key_filename=self.key_file)
self.controller_clients.append(client)
- self._ceilometer_apply_patches(client, self.cm_set_script)
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_set_script)
def restore_apply_patches(self):
self.log.info('restore apply patches start......')
+ restart_cm_cmd = 'sudo systemctl restart ' \
+ 'openstack-ceilometer-notification.service'
+
for client in self.controller_clients:
- self._ceilometer_apply_patches(client, self.cm_restore_script)
-
- def _ceilometer_apply_patches(self, ssh_client, script_name):
- installer_dir = os.path.dirname(os.path.realpath(__file__))
- script_abs_path = '{0}/{1}/{2}'.format(installer_dir,
- 'common', script_name)
-
- ssh_client.scp(script_abs_path, script_name)
- cmd = 'sudo python %s' % script_name
- ret, output = ssh_client.ssh(cmd)
- if ret:
- raise Exception('Do the ceilometer command in controller'
- ' node failed, ret=%s, cmd=%s, output=%s'
- % (ret, cmd, output))
- ssh_client.ssh('sudo systemctl restart '
- 'openstack-ceilometer-notification.service')
+ self._run_apply_patches(client,
+ restart_cm_cmd,
+ self.cm_restore_script)