From: Kefu Chai <kchai@redhat.com>
Date: Wed, 27 Jan 2021 01:49:20 +0000 (+0800)
Subject: cephadm: add fsid if --name is not specified
X-Git-Tag: v16.2.0~207^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbd7f6893fb888226b1fb4f2ed4d0fea2d0a8853;p=ceph.git

cephadm: add fsid if --name is not specified

address an regression introduced by
9e81a5dfc5abdd8caeecf42faa17111fc309b8d3

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 556b34a6679fe617743a46f5a0cf78fcb46a39b2)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 98a4e875737e..702186247a7c 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1621,7 +1621,7 @@ def infer_fsid(func):
             if not is_fsid(daemon['fsid']):
                 # 'unknown' fsid
                 continue
-            elif "name" in ctx or not ctx.name:
+            elif "name" not in ctx or not ctx.name:
                 # ctx.name not specified
                 fsids_set.add(daemon['fsid'])
             elif daemon['name'] == ctx.name: