From 4e2bdaf20e1bee6bd995bf980e16b052467f9d14 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Fri, 14 Aug 2020 13:04:23 +0200 Subject: [PATCH] provision/downburst: replace stock systemd-logger for opensuse-15.2 Teuthology uses rsyslog, but opensuse-15.2 has conflicting systemd-logger preinstalled. Signed-off-by: Kyr Shatskyy --- teuthology/provision/downburst.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/teuthology/provision/downburst.py b/teuthology/provision/downburst.py index 1da498abf..28c36bfd0 100644 --- a/teuthology/provision/downburst.py +++ b/teuthology/provision/downburst.py @@ -163,6 +163,8 @@ class Downburst(object): config_fd = tempfile.NamedTemporaryFile(delete=False, mode='wt') os_type = self.os_type.lower() + os_version = self.os_version.lower() + mac_address = self.status['mac_address'] cpus = int(os.environ.get('DOWNBURST_CPUS', 1)) @@ -197,6 +199,12 @@ class Downburst(object): ['passwd', '-d', self.user], ] } + # for opensuse-15.2 we need to replace systemd-logger with rsyslog for teuthology + if os_type == 'opensuse' and os_version == '15.2': + user_info['runcmd'].extend([ + ['zypper', 'rm', '-y', 'systemd-logger'], + ['zypper', 'in', '-y', 'rsyslog'], + ]) # Install git on downbursted VMs to clone upstream linux-firmware. # Issue #17154 if 'packages' not in user_info: -- 2.47.3