]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: fix naming of a local variable in find_cluster_by_uuid
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Mon, 25 Mar 2013 15:24:00 +0000 (16:24 +0100)
committerSage Weil <sage@inktank.com>
Fri, 26 Apr 2013 20:40:06 +0000 (13:40 -0700)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 0b5fcfffe6d2f69bd4318cc93ef73195d948b9c5)

src/ceph-disk

index 9c4b87dfdb4fc8b6a9af9d6858478f6d16d067a0..54d537739231d29a9cb78b19a728125337c0790d 100755 (executable)
@@ -1434,10 +1434,10 @@ def find_cluster_by_uuid(_uuid):
         if not conf_file.endswith('.conf'):
             continue
         cluster = conf_file[:-5]
-        u = get_conf(cluster, 'fsid')
-        if u is None:
+        fsid = get_conf(cluster, 'fsid')
+        if fsid is None:
             no_fsid.append(cluster)
-        elif u == _uuid:
+        elif fsid == _uuid:
             return cluster
     # be tolerant of /etc/ceph/ceph.conf without an fsid defined.
     if len(no_fsid) == 1 and no_fsid[0] == 'ceph':