From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 22 Jun 2023 02:39:13 +0000 (-0400)
Subject: qa: stop overriding ceph_w prefix in vstart_runner
X-Git-Tag: v19.0.0~760^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=77bf36fa5a9ed1bc40be78504f5945c50f3468be;p=ceph.git

qa: stop overriding ceph_w prefix in vstart_runner

These tools are now available in the $PATH so it's no longer necessary
to remove them.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 0f8b19fa6506d..4702bd471afc2 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -1529,8 +1529,6 @@ class CephManager:
         self.CEPH_CMD = ['sudo'] + pre + ['timeout', '120', 'ceph',
                                           '--cluster', self.cluster]
         self.RADOS_CMD = pre + ['rados', '--cluster', self.cluster]
-        self.run_ceph_w_prefix = ['sudo', 'daemon-helper', 'kill', 'ceph',
-                                  '--cluster', self.cluster]
 
         pools = self.list_pools()
         self.pools = {}
@@ -1630,7 +1628,7 @@ class CephManager:
                               'cluster', 'audit', ...
         :type watch_channel: str
         """
-        args = self.run_ceph_w_prefix + ['-w']
+        args = ['sudo', 'daemon-helper', 'kill', 'ceph', '--cluster', self.cluster, '-w']
         if watch_channel is not None:
             args.append("--watch-channel")
             args.append(watch_channel)
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index ac400726db1ff..182354c0a43d1 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -805,7 +805,6 @@ class LocalCephManager(CephManager):
         self.cephadm = False
         self.rook = False
         self.testdir = None
-        self.run_ceph_w_prefix = self.run_cluster_cmd_prefix = [CEPH_CMD]
         self.CEPH_CMD = [CEPH_CMD]
         self.RADOS_CMD = [RADOS_CMD]