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: v15.2.5~147^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32d305bc55f0cfab125dce0fde71ccf684af7b3f;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>
(cherry picked from commit 320956eb5ea5a43f0a0cd93fe580bc8d699eff1b)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index db15be9eec42..0ff70b01c943 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1079,7 +1079,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