From: Sage Weil <sage@newdream.net>
Date: Fri, 12 Nov 2021 20:52:46 +0000 (-0600)
Subject: qa/tasks/cephadm: use shortname for remote directory
X-Git-Tag: v17.1.0~367^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e40064d310129260ae33b61e947005d7325d4ab;p=ceph.git

qa/tasks/cephadm: use shortname for remote directory

This aligns with what the ceph and syslog tasks do.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index d6dd58abba733..6331793985a0b 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -296,7 +296,7 @@ def ceph_log(ctx, config):
             except OSError:
                 pass
             for remote in ctx.cluster.remotes.keys():
-                sub = os.path.join(path, remote.name)
+                sub = os.path.join(path, remote.shortname)
                 try:
                     os.makedirs(sub)
                 except OSError:
@@ -330,7 +330,7 @@ def ceph_crash(ctx, config):
             except OSError:
                 pass
             for remote in ctx.cluster.remotes.keys():
-                sub = os.path.join(path, remote.name)
+                sub = os.path.join(path, remote.shortname)
                 try:
                     os.makedirs(sub)
                 except OSError: