]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/tasks/ceph_manager: fix admin_socket remote when using cephadm
authorSage Weil <sage@redhat.com>
Fri, 17 Jan 2020 20:48:40 +0000 (14:48 -0600)
committerSage Weil <sage@redhat.com>
Fri, 17 Jan 2020 23:07:40 +0000 (17:07 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
qa/tasks/ceph_manager.py

index 11c7950922556d81d11cc44ef78feb633070d1a1..19af6c5747ca631e9cecb0d528540e5985eca07f 100644 (file)
@@ -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',