fixes for kraken and lower versions
Change-Id: I0543b8ab2169e561ac8189331f38c8c5baa5a696
diff --git a/_grains/ceph.py b/_grains/ceph.py
index 1b4dfb2..a678404 100644
--- a/_grains/ceph.py
+++ b/_grains/ceph.py
@@ -25,10 +25,14 @@
devices[device[0]]['dev'] = dev
tline = check_output("ceph osd tree | awk '{print $1,$2,$3,$4}' | grep -w 'osd." + device[0] + "'", shell=True)
osd = tline.split()
- crush_class = osd[1]
- crush_weight = osd[2]
- devices[device[0]]['class'] = crush_class
- devices[device[0]]['weight'] = crush_weight
+ if "osd" not in osd[2]:
+ crush_class = osd[1]
+ crush_weight = osd[2]
+ devices[device[0]]['class'] = crush_class
+ devices[device[0]]['weight'] = crush_weight
+ else:
+ crush_weight = osd[1]
+ devices[device[0]]['weight'] = crush_weight
grain["ceph"]["ceph_disk"] = devices
# keyrings