From: Laura Flores <lflores@ibm.com>
Date: Wed, 14 Aug 2024 19:37:06 +0000 (-0500)
Subject: Revert "orchestra/daemon/cephadmunit.py: fix method kill_cmd()"
X-Git-Tag: 1.2.0~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a8b63e7956c84a9fb93e5cf1a0c6390f355838e4;p=teuthology.git

Revert "orchestra/daemon/cephadmunit.py: fix method kill_cmd()"

This reverts commit 2c6d64a222b4d38d4782ed407e045a86df0a6524.

Related tracker: https://tracker.ceph.com/issues/66883
---

diff --git a/teuthology/orchestra/daemon/cephadmunit.py b/teuthology/orchestra/daemon/cephadmunit.py
index 87c380d0d..f4959b173 100644
--- a/teuthology/orchestra/daemon/cephadmunit.py
+++ b/teuthology/orchestra/daemon/cephadmunit.py
@@ -35,9 +35,9 @@ class CephadmUnit(DaemonState):
 
     def kill_cmd(self, sig):
         return ' '.join([
-            'sudo', 'systemctl', 'kill',
+            'sudo', 'docker', 'kill',
             '-s', str(int(sig)),
-            'ceph-%s@%s.%s' % (self.fsid, self.type_, self.id_),
+            'ceph-%s-%s.%s' % (self.fsid, self.type_, self.id_),
         ])
 
     def _start_logger(self):