]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: add fsid if --name is not specified
authorKefu Chai <kchai@redhat.com>
Wed, 27 Jan 2021 01:49:20 +0000 (09:49 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 10 Feb 2021 12:26:25 +0000 (13:26 +0100)
address an regression introduced by
9e81a5dfc5abdd8caeecf42faa17111fc309b8d3

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

src/cephadm/cephadm

index 98a4e875737e1301724c81e45bfd2f8f4ef8e3d1..702186247a7c4c5b841f4ab2e9245ed221c19913 100755 (executable)
@@ -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: