From: Danny Al-Gaaf Date: Mon, 25 Mar 2013 15:24:00 +0000 (+0100) Subject: ceph-disk: fix naming of a local variable in find_cluster_by_uuid X-Git-Tag: v0.56.5~5^2~19 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ecb34b81b843adaf9455503eb3ecc69ea94652a3;p=ceph.git ceph-disk: fix naming of a local variable in find_cluster_by_uuid Signed-off-by: Danny Al-Gaaf (cherry picked from commit 0b5fcfffe6d2f69bd4318cc93ef73195d948b9c5) --- diff --git a/src/ceph-disk b/src/ceph-disk index 9c4b87dfdb4f..54d537739231 100755 --- a/src/ceph-disk +++ b/src/ceph-disk @@ -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':