From: Sage Weil <sage@redhat.com>
Date: Sat, 21 Dec 2019 23:06:05 +0000 (-0600)
Subject: qa/tasks/ceph_manager: asok commands via cephadm shell
X-Git-Tag: v15.1.0~390^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e57785e74837160fbe0a8d458e037c1efea61f5;p=ceph.git

qa/tasks/ceph_manager: asok commands via cephadm shell

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 0528c4c76e58..c6c780f717f2 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -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 = [