From: Sage Weil <sage@redhat.com>
Date: Fri, 17 Jan 2020 20:48:40 +0000 (-0600)
Subject: qa/tasks/ceph_manager: fix admin_socket remote when using cephadm
X-Git-Tag: v15.1.0~189^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=878e27ee0dac812a9b9ba396c581c387ccbf1e81;p=ceph.git

qa/tasks/ceph_manager: fix admin_socket remote when using cephadm

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

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 11c795092255..19af6c5747ca 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -1565,9 +1565,11 @@ class CephManager:
         if stdout is None:
             stdout = StringIO()
 
+        remote = self.find_remote(service_type, service_id)
+
         if self.cephadm:
             return shell(
-                self.ctx, self.cluster, self.controller,
+                self.ctx, self.cluster, remote,
                 args=[
                     'ceph', 'daemon', '%s.%s' % (service_type, service_id),
                 ] + command,
@@ -1577,7 +1579,6 @@ class CephManager:
             )
 
         testdir = teuthology.get_testdir(self.ctx)
-        remote = self.find_remote(service_type, service_id)
         args = [
             'sudo',
             'adjust-ulimits',