import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / lvm / strategies / strategies.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/strategies.py b/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/strategies.py
index ad69ab7b322044d6e9cc3f5ad61e0fbba3e87c32..75d748fa8123c9a263c54b59b19a06d4ab0d8f68 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/strategies.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/strategies.py
@@ -1,5 +1,6 @@
 import json
 from ceph_volume.util.prepare import osd_id_available
+from ceph_volume.api.lvm import get_device_vgs
 
 class Strategy(object):
 
@@ -64,10 +65,6 @@ class MixedStrategy(Strategy):
     def get_common_vg(self, devs):
         # find all the vgs associated with the current device
         for dev in devs:
-            for pv in dev.pvs_api:
-                vg = self.system_vgs.get(vg_name=pv.vg_name)
-                if not vg:
-                    continue
-                # this should give us just one VG, it would've been caught by
-                # the validator otherwise
-                return vg
+            vgs = get_device_vgs(dev.abspath)
+            if vgs:
+                return vgs[0]