]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: stop overriding ceph_w prefix in vstart_runner
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 22 Jun 2023 02:39:13 +0000 (22:39 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 1 Aug 2023 15:16:28 +0000 (11:16 -0400)
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>
qa/tasks/ceph_manager.py
qa/tasks/vstart_runner.py

index 0f8b19fa6506d464267a401dc3e029a3923dcf5f..4702bd471afc2b1889d98d27ad50373f526cc46a 100644 (file)
@@ -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)
index ac400726db1ffc7b876d1293d8880dfbd93f063c..182354c0a43d1b7fd3176dfafc58786a30549df8 100644 (file)
@@ -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]