From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 29 Apr 2020 11:47:24 +0000 (+0200)
Subject: cephadmunit: Python3 fix: signal.SIGHUP is no longer an int.
X-Git-Tag: 1.1.0~122^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bc101d562b0ef3aa7ff6a0362b4c550a27c89e79;p=teuthology.git

cephadmunit: Python3 fix: signal.SIGHUP is no longer an int.

py2: `str(signal.SIGHUP) == "1"`
py3: `str(signal.SIGHUP) == "signal.SIGHUP"`

Fixes: https://tracker.ceph.com/issues/45297

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/teuthology/orchestra/daemon/cephadmunit.py b/teuthology/orchestra/daemon/cephadmunit.py
index 27159dfcca..fbc3328733 100644
--- a/teuthology/orchestra/daemon/cephadmunit.py
+++ b/teuthology/orchestra/daemon/cephadmunit.py
@@ -36,7 +36,7 @@ class CephadmUnit(DaemonState):
     def kill_cmd(self, sig):
         return ' '.join([
             'sudo', 'docker', 'kill',
-            '-s', str(sig),
+            '-s', str(int(sig)),
             'ceph-%s-%s.%s' % (self.fsid, self.type_, self.id_),
         ])