]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/ceph_manager: asok commands via cephadm shell
authorSage Weil <sage@redhat.com>
Sat, 21 Dec 2019 23:06:05 +0000 (17:06 -0600)
committerSage Weil <sage@redhat.com>
Mon, 23 Dec 2019 19:59:26 +0000 (13:59 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
qa/tasks/ceph_manager.py

index 0528c4c76e58c737405f04b030390a68864030c5..c6c780f717f21e57fe3ee72548def280fe49c8de 100644 (file)
@@ -1530,6 +1530,18 @@ class CephManager:
         """
         if stdout is None:
             stdout = StringIO()
+
+        if self.cephadm:
+            return shell(
+                self.ctx, self.cluster, self.controller,
+                args=[
+                    'ceph', 'daemon', '%s.%s' % (service_type, service_id),
+                ] + command,
+                stdout=stdout,
+                wait=True,
+                check_status=check_status,
+            )
+
         testdir = teuthology.get_testdir(self.ctx)
         remote = self.find_remote(service_type, service_id)
         args = [