From: Michael Fritch <mfritch@suse.com>
Date: Mon, 15 Jun 2020 21:22:08 +0000 (-0600)
Subject: cephadm: sort the list of inferred fsids
X-Git-Tag: v16.1.0~2034^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=320956eb5ea5a43f0a0cd93fe580bc8d699eff1b;p=ceph.git

cephadm: sort the list of inferred fsids

$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['1d5df33f-eb94-4a4f-b192-1d5e770ed0e7', 'unknown']
$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['unknown', '1d5df33f-eb94-4a4f-b192-1d5e770ed0e7']

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 7c0cb328ee27..a195338d5bf5 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1076,7 +1076,7 @@ def infer_fsid(func):
                 fsids.add(daemon['fsid'])
             elif daemon['name'] == args.name:
                 fsids.add(daemon['fsid'])
-        fsids = list(fsids)
+        fsids = sorted(fsids)
 
         if not fsids:
             # some commands do not always require an fsid