From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2021 15:17:14 +0000 (-0400)
Subject: mgr/cephadm: simplify
X-Git-Tag: v16.2.5~87^2~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b73ca1b33ee68b3cfdbeb875009793a70fd214c;p=ceph.git

mgr/cephadm: simplify

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 991515aaaa19eeee93f6b98b6721ed2b3efbff1b)
---

diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py
index de7f8a61e903..6ea9058be657 100644
--- a/src/pybind/mgr/cephadm/schedule.py
+++ b/src/pybind/mgr/cephadm/schedule.py
@@ -28,8 +28,7 @@ class DaemonPlacement(NamedTuple):
         if self.name:
             other.append(f'name={self.name}')
         if self.ports:
-            other.append(
-                f'{self.ip or "*"}:{self.ports[0] if len(self.ports) == 1 else ",".join(map(str, self.ports))}')
+            other.append(f'{self.ip or "*"}:{",".join(map(str, self.ports))}')
         if other:
             res += '(' + ' '.join(other) + ')'
         return res