X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Finstaller%2Fapex.py;h=c851b2acde47469d6e5ebf0f4d4dd255f6bd0557;hb=9bc09d1d18d4777438515393a9427fc0733e6f09;hp=2a1ce94bc4b642ccb0ea3b1622266e65a3ae96b5;hpb=079ac9a481fcc1baa53cb5ab2896bbe037585f3b;p=doctor.git diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py index 2a1ce94b..c851b2ac 100644 --- a/doctor_tests/installer/apex.py +++ b/doctor_tests/installer/apex.py @@ -6,13 +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 SSHClient from doctor_tests.installer.base import BaseInstaller @@ -26,17 +19,18 @@ 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() self.controller_clients = list() - self.servers = list() 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() @@ -46,21 +40,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 - - self.client.scp('/home/stack/.ssh/id_rsa', './instack_key', method='get') - user = getpass.getuser() - uid = pwd.getpwnam(user).pw_uid - gid = grp.getgrnam(user).gr_gid - os.chown('./instack_key', uid, gid) - os.chmod('./instack_key', stat.S_IREAD) - current_dir = os.curdir - self.key_file = '{0}/{1}'.format(current_dir, 'instack_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......') @@ -68,59 +49,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)) - self.log.info('Get controller_ips:%s from Apex installer' % controllers) - self.controllers = controllers + controllers = self._run_cmd_remote(self.client, command) + self.log.info('Get controller_ips:%s from Apex installer' + % 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) - 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 = "sudo 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() + command = "source stackrc; nova show %s | awk '/ ctlplane network /{print $5}'" % (hostname_in_undercloud) # noqa + 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) + 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......') - 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') + restart_cm_cmd = 'sudo systemctl restart ' \ + 'openstack-ceilometer-notification.service' + for client in self.controller_clients: + self._run_apply_patches(client, + restart_cm_cmd, + self.cm_restore_script)