From: youji <youji@ebay.com>
Date: Fri, 8 Apr 2016 14:16:04 +0000 (-0700)
Subject: ceph-disk: fix set_data_partition() when data is partition.
X-Git-Tag: v10.1.2~9^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=877004350668d349de98243f0499c042d73eddcf;p=ceph.git

ceph-disk: fix set_data_partition() when data is partition.

Signed-off-by: You Ji <youji@ebay.com>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index d0ec596c2aa4..c13cda44df8a 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -2539,8 +2539,8 @@ class PrepareData(object):
                       self.args.data)
             self.partition = DevicePartition.factory(
                 path=None, dev=self.args.data, args=self.args)
-            ptype = partition.get_ptype()
-            ready = Ptype.get_ready_by_type('osd')
+            ptype = self.partition.get_ptype()
+            ready = Ptype.get_ready_by_name('osd')
             if ptype not in ready:
                 LOG.warning('incorrect partition UUID: %s, expected %s'
                             % (ptype, str(ready)))