From 5b098ca0e749946a44f36dc2ecbc109ef05c0010 Mon Sep 17 00:00:00 2001 From: youji Date: Fri, 8 Apr 2016 08:29:45 -0700 Subject: [PATCH] ceph-disk: fix lockbox set_or_create_partition() Signed-off-by: You Ji --- src/ceph-disk/ceph_disk/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index c13cda44df8a..996557fa74ee 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -122,7 +122,7 @@ class Ptype(object): @staticmethod def get_ready_by_name(name): - return [x[name]['ready'] for x in PTYPE.values()] + return [x[name]['ready'] for x in PTYPE.values() if name in x] @staticmethod def is_regular_space(ptype): @@ -2241,8 +2241,8 @@ class Lockbox(object): self.args.lockbox) self.partition = DevicePartition.factory( path=None, dev=self.args.lockbox, args=self.args) - ptype = partition.get_ptype() - ready = Ptype.get_ready_by_type('lockbox') + ptype = self.partition.get_ptype() + ready = Ptype.get_ready_by_name('lockbox') if ptype not in ready: LOG.warning('incorrect partition UUID: %s, expected %s' % (ptype, str(ready))) -- 2.47.3