From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 25 Feb 2016 05:49:59 +0000 (+0700)
Subject: ceph-disk: re-using an OSD partition bugous test
X-Git-Tag: v10.1.0~200^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67f9e8dace7c3444c500fa05b4083f965f04aa49;p=ceph.git

ceph-disk: re-using an OSD partition bugous test

When re-using an OSD partition, the test of the partition type is done
against a non-existent variable.

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 250d1e79eca2..133e40416250 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -2329,9 +2329,10 @@ class PrepareData(object):
             self.partition = DevicePartition.factory(
                 path=None, dev=self.args.data, args=self.args)
             ptype = partition.get_ptype()
-            if ptype != ptype_osd:
+            ready = Ptype.get_ready_by_type('osd')
+            if ptype not in ready:
                 LOG.warning('incorrect partition UUID: %s, expected %s'
-                            % (ptype, ptype_osd))
+                            % (ptype, str(ready)))
         else:
             LOG.debug('Creating osd partition on %s',
                       self.args.data)